This commit is contained in:
2020-09-05 01:29:46 +08:00
parent 2b000a6ecf
commit d2320bead7
3 changed files with 5 additions and 11 deletions
+3 -9
View File
@@ -38,23 +38,17 @@ abstract class Pool extends Component
/**
* @param $name
* @param int $timeout
* @return mixed
* @throws Exception
*/
protected function get($name, $timeout = -1)
protected function get($name)
{
if ($timeout != -1) {
$client = $this->_items[$name]->pop($timeout);
} else {
$client = $this->_items[$name]->pop();
}
[$timeout, $connection] = $client;
[$timeout, $connection] = $this->_items[$name]->pop();
if (!$this->checkCanUse($name, $timeout, $connection)) {
unset($client);
return [0, null];
} else {
return $client;
return [$timeout, $connection];
}
}
+1 -1
View File
@@ -190,7 +190,7 @@ class Connection extends Pool
*/
public function getByChannel($coroutineName, $config)
{
[$time, $client] = $this->get($coroutineName, -1);
[$time, $client] = $this->get($coroutineName);
if ($client instanceof PDO) {
return $this->saveClient($coroutineName, $client);
}
+1 -1
View File
@@ -60,7 +60,7 @@ class Redis extends Pool
$this->success('create redis client -> ' . $config['host'] . ':' . $this->size($coroutineName));
return $this->saveClient($coroutineName, $this->createConnect($config));
}
[$time, $client] = $this->get($coroutineName, -1);
[$time, $client] = $this->get($coroutineName);
if ($client === null) {
return $this->getByChannel($coroutineName, $config);
}