From dbf33b6d7db5c1b48f4bc0bc787dcd6d5d5e5d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Tue, 20 Sep 2022 18:35:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Connection.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Connection.php b/Connection.php index 2d31ec7..ebe4851 100644 --- a/Connection.php +++ b/Connection.php @@ -277,11 +277,10 @@ class Connection extends Component */ public function clear_connection() { - $this->connection->connection_clear($this->cds); - if (!isset($this->slaveConfig['cds']) || $this->cds == $this->slaveConfig['cds']) { - return; - } - $this->connection->connection_clear($this->slaveConfig['cds']); + $cds = $this->slaveConfig['cds'] ?? $this->cds; + + $this->connection->connection_clear($cds.'master'); + $this->connection->connection_clear($cds.'slave'); } @@ -290,11 +289,10 @@ class Connection extends Component */ public function disconnect() { - $this->connection->disconnect($this->cds); - if (!isset($this->slaveConfig['cds']) || $this->cds == $this->slaveConfig['cds']) { - return; - } - $this->connection->disconnect($this->slaveConfig['cds']); + $cds = $this->slaveConfig['cds'] ?? $this->cds; + + $this->connection->connection_clear($cds.'master'); + $this->connection->connection_clear($cds.'slave'); } }