From 1955e738812b47ef686890aed1ffb5a76eb978d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Wed, 8 Jun 2022 16:13:16 +0800 Subject: [PATCH] modify plugin name --- kiri-engine/Pool/Connection.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/kiri-engine/Pool/Connection.php b/kiri-engine/Pool/Connection.php index 9e704c98..7d5c7a25 100644 --- a/kiri-engine/Pool/Connection.php +++ b/kiri-engine/Pool/Connection.php @@ -95,21 +95,17 @@ class Connection extends Component */ public function get(mixed $config): ?PDO { - $coroutineName = $config['cds']; - if (isset($this->master[$coroutineName])) { - return $this->master[$coroutineName]; - } $minx = Config::get('databases.pool.min', 1); - $connect = $this->pool->get($coroutineName, static function () use ($coroutineName, $config) { - return Kiri::getDi()->create(PDO::class, [$config]); - }, $minx); - if (Db::inTransactionsActive()) { + return $this->pool->get($config['cds'], static function () use ($config) { + $connect = Kiri::getDi()->create(PDO::class, [$config]); + if (!Db::inTransactionsActive()) { + return $connect; + } if (!$connect->inTransaction()) { $connect->beginTransaction(); } - return $this->master[$coroutineName] = $connect; - } - return $connect; + return $connect; + }, $minx); }