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-04-27 18:27:33 +08:00
parent 1caceead5d
commit 88a67ac021
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
System/Abstracts/Pool.php
+1 -3
View File
@@ -170,11 +170,9 @@ abstract class Pool extends Component
} }
$channel = $this->_items[$name]; $channel = $this->_items[$name];
if ($channel->isEmpty()) { if ($channel->isEmpty()) {
return $this->createClient($name, $callback);
$this->createByCallback($name, $callback); $this->createByCallback($name, $callback);
} }
return $channel->pop(0.002); $connection = $channel->pop(0.002);
if (!$this->checkCanUse($name, $connection)) { if (!$this->checkCanUse($name, $connection)) {
return $this->createClient($name, $callback); return $this->createClient($name, $callback);
} else { } else {
System/Pool/Connection.php
+4 -4
View File
@@ -159,10 +159,10 @@ class Connection extends Pool
$link->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false); $link->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
$link->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_EMPTY_STRING); $link->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_EMPTY_STRING);
$charset = $config['charset'] ?? 'utf8mb4'; // $charset = $config['charset'] ?? 'utf8mb4';
if (!empty($charset)) { // if (!empty($charset)) {
$link->query('SET NAMES ' . $charset); // $link->query('SET NAMES ' . $charset);
} // }
// $this->printClients($config['cds'], '', ''); // $this->printClients($config['cds'], '', '');
// $this->increment($name); // $this->increment($name);