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
2021-01-05 14:20:51 +08:00
parent 5f9dbba33e
commit 8f7c84a456
2 changed files with 2 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
System/Pool/Connection.php
+1
View File
@@ -238,6 +238,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 has num ' . $this->size($coroutineName) . ', has create ' . $this->hasCreate[$coroutineName]);
$this->success('create db client -> ' . $cds . ':' . env('workerId', 0) . ':' . Coroutine::getCid()); $this->success('create db client -> ' . $cds . ':' . env('workerId', 0) . ':' . Coroutine::getCid());
$this->incr($coroutineName); $this->incr($coroutineName);
if ($number = Context::getContext('begin_' . $coroutineName, Coroutine::getCid())) { if ($number = Context::getContext('begin_' . $coroutineName, Coroutine::getCid())) {
System/Pool/Redis.php
+1 -40
View File
@@ -85,6 +85,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 db client has num ' . $this->size($coroutineName) . ', has create ' . $this->_create);
$this->success('create redis client -> ' . $config['host'] . ':' . env('workerId', 0) . ':' . Coroutine::getCid()); $this->success('create redis client -> ' . $config['host'] . ':' . env('workerId', 0) . ':' . Coroutine::getCid());
if (!isset($config['read_timeout'])) { if (!isset($config['read_timeout'])) {
$config['read_timeout'] = 10; $config['read_timeout'] = 10;
@@ -110,46 +111,6 @@ class Redis extends Pool
} }
/**
* @param array $config
* @param string $coroutineName
* @throws Exception
*/
// private function createConnect(array $config, string $coroutineName): void
// {
// try {
// if ($this->_create >= $this->max) {
// return;
// }
// $this->_create += 1;
// if (Context::hasContext('at_create_db')) {
// return;
// }
// Context::setContext('at_create_db', 1);
// $redis = new SRedis();
// if (!$redis->connect($config['host'], (int)$config['port'], $config['timeout'])) {
// throw new RedisConnectException(sprintf('The Redis Connect %s::%d Fail.', $config['host'], $config['port']));
// }
// 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']));
// }
// $this->success('create redis client -> ' . $config['host'] . ':' . $this->size($coroutineName));
// if (!isset($config['read_timeout'])) {
// $config['read_timeout'] = 10;
// }
// $redis->select($config['databases']);
// $redis->setOption(SRedis::OPT_READ_TIMEOUT, $config['read_timeout']);
// $redis->setOption(SRedis::OPT_PREFIX, $config['prefix']);
//
// $this->push($coroutineName, $redis);
// } catch (\Throwable $exception) {
// $this->addError($exception->getMessage());
// } finally {
// Context::deleteId('at_create_db');
// }
//
// }
/** /**
* @param array $config * @param array $config
* @param bool $isMaster * @param bool $isMaster