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:
向林
2023-04-02 00:34:55 +08:00
parent 437e52896e
commit b4e9e204bc
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kiri-engine/Pool/Connection.php
+24 -26
View File
@@ -99,15 +99,11 @@ class Connection extends Component
if (!$this->pool->hasChannel($config['cds'])) {
$this->pool->initConnections($config['cds'], $config['pool']['max']);
}
if (Context::hasContext($config['cds'])) {
if (!Context::hasContext($config['cds'])) {
return Context::setContext($config['cds'], $this->pool->get($config['cds'], $this->generate($config)));
} else {
return Context::getContext($config['cds']);
}
if ($this->pool->hasItem($config['cds'])) {
$connect = $this->pool->get($config['cds']);
} else {
$connect = $this->generate($config);
}
return Context::setContext($config['cds'], $connect);
}
@@ -115,27 +111,29 @@ class Connection extends Component
* @param array $config
* @return Closure
*/
public function generate(array $config): \PDO
public function generate(array $config): Closure
{
Kiri::getDi()->get(Kiri\Error\StdoutLoggerInterface::class)->alert('create database connect(' . $config['cds'] . ')');
return static function () use ($config) {
Kiri::getDi()->get(Kiri\Error\StdoutLoggerInterface::class)->alert('create database connect(' . $config['cds'] . ')');
$link = new \PDO('mysql:dbname=' . $config['dbname'] . ';host=' . $config['cds'], $config['username'], $config['password'], [
\PDO::ATTR_EMULATE_PREPARES => false,
\PDO::ATTR_CASE => \PDO::CASE_NATURAL,
\PDO::ATTR_PERSISTENT => true,
\PDO::ATTR_TIMEOUT => $config['connect_timeout'],
\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . ($config['charset'] ?? 'utf8mb4')
]);
$link->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
$link->setAttribute(\PDO::ATTR_STRINGIFY_FETCHES, false);
$link->setAttribute(\PDO::ATTR_ORACLE_NULLS, \PDO::NULL_EMPTY_STRING);
foreach ($config['attributes'] as $key => $attribute) {
$link->setAttribute($key, $attribute);
}
if (Db::inTransactionsActive()) {
$link->beginTransaction();
}
return $link;
$link = new \PDO('mysql:dbname=' . $config['dbname'] . ';host=' . $config['cds'], $config['username'], $config['password'], [
\PDO::ATTR_EMULATE_PREPARES => false,
\PDO::ATTR_CASE => \PDO::CASE_NATURAL,
\PDO::ATTR_PERSISTENT => true,
\PDO::ATTR_TIMEOUT => $config['connect_timeout'],
\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . ($config['charset'] ?? 'utf8mb4')
]);
$link->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
$link->setAttribute(\PDO::ATTR_STRINGIFY_FETCHES, false);
$link->setAttribute(\PDO::ATTR_ORACLE_NULLS, \PDO::NULL_EMPTY_STRING);
foreach ($config['attributes'] as $key => $attribute) {
$link->setAttribute($key, $attribute);
}
if (Db::inTransactionsActive()) {
$link->beginTransaction();
}
return $link;
};
}
kiri-engine/Pool/Pool.php
+6 -2
View File
@@ -155,9 +155,13 @@ class Pool extends Component
* @throws ConfigException
* @throws Exception
*/
public function get($name): mixed
public function get($name, $callback): mixed
{
return $this->channel($name)->pop();
$channel = $this->channel($name);
if (!$channel->isEmpty()) {
return $channel->pop();
}
return $callback();
}