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

变更

Browse Source
This commit is contained in:
向林
2023-04-19 10:51:08 +08:00
parent ebbc3368bd
commit ed0035a707
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Connection.php
-1
View File
@@ -18,7 +18,6 @@ use Database\Mysql\Schema;
use Exception; use Exception;
use Kiri; use Kiri;
use Kiri\Abstracts\Component; use Kiri\Abstracts\Component;
use Psr\Container\ContainerInterface;
use Kiri\Di\Context; use Kiri\Di\Context;
use Kiri\Pool\Pool; use Kiri\Pool\Pool;
use Kiri\Events\EventProvider; use Kiri\Events\EventProvider;
DatabasesProviders.php
+5 -18
View File
@@ -8,13 +8,8 @@ use Exception;
use Kiri; use Kiri;
use Kiri\Abstracts\Config; use Kiri\Abstracts\Config;
use Kiri\Abstracts\Providers; use Kiri\Abstracts\Providers;
use Kiri\Pool\Connection as PoolConnection;
use Kiri\Events\EventProvider;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Swoole\Timer; use Swoole\Timer;
use Kiri\Di\LocalService; use Kiri\Di\LocalService;
use Kiri\Di\Inject\Container;
/** /**
* Class DatabasesProviders * Class DatabasesProviders
@@ -44,7 +39,7 @@ class DatabasesProviders extends Providers
} }
public function start() public function start(): void
{ {
if (!Kiri\Di\Context::inCoroutine()) { if (!Kiri\Di\Context::inCoroutine()) {
return; return;
@@ -55,13 +50,9 @@ class DatabasesProviders extends Providers
return; return;
} }
$connection = Kiri::getDi()->get(PoolConnection::class); $connection = Kiri::getDi()->get(Kiri\Pool\Pool::class);
foreach ($databases as $database) { foreach ($databases as $database) {
$connection->flush($database['cds'] . 'master', $database['pool']['min'] ?? 1); $connection->flush($database['cds'], $database['pool']['min'] ?? 1);
$slaveCds = ($database['slaveConfig']['cds'] ?? $database['cds']) . 'slave';
$connection->flush($slaveCds, $database['pool']['min'] ?? 1);
} }
}); });
} }
@@ -76,13 +67,9 @@ class DatabasesProviders extends Providers
Timer::clearAll(); Timer::clearAll();
$databases = Config::get('databases.connections', []); $databases = Config::get('databases.connections', []);
if (!empty($databases)) { if (!empty($databases)) {
$connection = Kiri::getDi()->get(PoolConnection::class); $connection = Kiri::getDi()->get(Kiri\Pool\Pool::class);
foreach ($databases as $database) { foreach ($databases as $database) {
$connection->disconnect($database['cds'] . 'master'); $connection->clean($database['cds']);
$slaveCds = ($database['slaveConfig']['cds'] ?? $database['cds']) . 'slave';
$connection->disconnect($slaveCds);
} }
} }
} }