as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2020-10-16 17:06:59 +08:00
parent 9832d3bf22
commit 541400bb96
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
System/Pool/Connection.php
+1 -1
View File
@@ -235,7 +235,6 @@ class Connection extends Pool
*/ */
private function nowClient($coroutineName, $config) private function nowClient($coroutineName, $config)
{ {
$this->success('create db client -> ' . $config['cds'] . ':' . $this->hasCreate[$coroutineName] . ':' . $this->size($coroutineName));
$client = $this->createConnect($coroutineName, ...$this->parseConfig($config)); $client = $this->createConnect($coroutineName, ...$this->parseConfig($config));
if ($number = Context::getContext('begin_' . $coroutineName, Coroutine::getCid())) { if ($number = Context::getContext('begin_' . $coroutineName, Coroutine::getCid())) {
$number > 0 && $client->beginTransaction(); $number > 0 && $client->beginTransaction();
@@ -372,6 +371,7 @@ class Connection extends Pool
if (!empty($charset)) { if (!empty($charset)) {
$link->query('SET NAMES ' . $charset); $link->query('SET NAMES ' . $charset);
} }
$this->success('create db client -> ' . $cds . ':' . $this->hasCreate[$coroutineName] . ':' . $this->size($coroutineName));
$this->incr($coroutineName); $this->incr($coroutineName);
return $link; return $link;
} catch (\Throwable $exception) { } catch (\Throwable $exception) {
System/Pool/Redis.php
+6 -6
View File
@@ -40,8 +40,7 @@ class Redis extends Pool
if (Context::hasContext($coroutineName)) { if (Context::hasContext($coroutineName)) {
return Context::getContext($coroutineName); return Context::getContext($coroutineName);
} else if (!$this->hasItem($coroutineName)) { } else if (!$this->hasItem($coroutineName)) {
$this->success('create redis client -> ' . $config['host'] . ':' . $this->size($coroutineName)); return $this->saveClient($coroutineName, $this->createConnect($config, $coroutineName));
return $this->saveClient($coroutineName, $this->createConnect($config));
} }
return $this->getByChannel($coroutineName, $config); return $this->getByChannel($coroutineName, $config);
} }
@@ -56,8 +55,7 @@ class Redis extends Pool
public function getByChannel($coroutineName, $config) public function getByChannel($coroutineName, $config)
{ {
if (!$this->hasItem($coroutineName)) { if (!$this->hasItem($coroutineName)) {
$this->success('create redis client -> ' . $config['host'] . ':' . $this->size($coroutineName)); return $this->saveClient($coroutineName, $this->createConnect($config, $coroutineName));
return $this->saveClient($coroutineName, $this->createConnect($config));
} }
$clients = $this->get($coroutineName); $clients = $this->get($coroutineName);
if ($clients[1] === null) { if ($clients[1] === null) {
@@ -81,10 +79,11 @@ class Redis extends Pool
/** /**
* @param array $config * @param array $config
* @param string $coroutineName
* @return SRedis * @return SRedis
* @throws Exception * @throws RedisConnectException
*/ */
private function createConnect(array $config) private function createConnect(array $config, string $coroutineName)
{ {
$redis = new SRedis(); $redis = new SRedis();
if (!$redis->connect($config['host'], $config['port'], $config['timeout'])) { if (!$redis->connect($config['host'], $config['port'], $config['timeout'])) {
@@ -93,6 +92,7 @@ class Redis extends Pool
if (empty($config['auth']) || !$redis->auth($config['auth'])) { if (empty($config['auth']) || !$redis->auth($config['auth'])) {
throw new RedisConnectException(sprintf('Redis Error: %s, Host %s, Auth %s', $redis->getLastError(), $config['host'], $config['auth'])); throw new RedisConnectException(sprintf('Redis Error: %s, Host %s, Auth %s', $redis->getLastError(), $config['host'], $config['auth']));
} }
$this->success('create redis client -> ' . $config['host'] . ':' . $this->size($coroutineName));
if (!isset($config['read_timeout'])) { if (!isset($config['read_timeout'])) {
$config['read_timeout'] = 10; $config['read_timeout'] = 10;
} }