From 531b54edb26049ac91df77be2dd760a938bc5287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Mon, 11 Jul 2022 14:34:41 +0800 Subject: [PATCH] modify plugin name --- DatabasesProviders.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/DatabasesProviders.php b/DatabasesProviders.php index da52aa8..70ddc63 100644 --- a/DatabasesProviders.php +++ b/DatabasesProviders.php @@ -89,9 +89,7 @@ class DatabasesProviders extends Providers */ public function check(OnTaskerStart|OnWorkerStart $start): void { - Timer::after(60000, static function () use ($start) { - DatabasesProviders::filter($start); - }); + Timer::after(60000, fn() => DatabasesProviders::filter($start)); } @@ -106,7 +104,7 @@ class DatabasesProviders extends Providers $logger = Kiri::getDi()->get(LoggerInterface::class); $databases = Config::get('databases.connections', []); if (!empty($databases)) { - DatabasesProviders::each($databases, $logger, $count, $valid); + [$valid, $count] = DatabasesProviders::each($databases, $logger); } $const = 'Worker %d db client has %d, valid %d'; $logger->alert(sprintf($const, $start->workerId, $count, $valid)); @@ -118,13 +116,12 @@ class DatabasesProviders extends Providers /** * @param $databases * @param LoggerInterface $logger - * @param $count - * @param $valid - * @return void + * @return array */ - public static function each($databases, LoggerInterface $logger, &$count, &$valid): void + public static function each($databases, LoggerInterface $logger): array { $connection = Kiri::getDi()->get(PoolConnection::class); + $valid = $count = 0; foreach ($databases as $database) { try { [$total, $success] = $connection->check($database['cds']); @@ -144,6 +141,8 @@ class DatabasesProviders extends Providers $logger->error($throwable->getMessage()); } } + + return [$valid, $count]; }