From 11c306068290f3221a163da8ed5c89bc62306f81 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Tue, 8 Nov 2022 12:25:54 +1300 Subject: [PATCH] Revert "WIP fix too many connections" registry changes This reverts commit a6ffab09df3d69ce2c5c73a2b1de22418a5fac45. --- app/realtime.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/realtime.php b/app/realtime.php index 8ee4e6476..be87c3d6e 100644 --- a/app/realtime.php +++ b/app/realtime.php @@ -35,9 +35,6 @@ Runtime::enableCoroutine(SWOOLE_HOOK_ALL); $realtime = new Realtime(); -$dbPool = $register->get('dbPool'); -$redisPool = $register->get('redisPool'); - /** * Table for statistics across all workers. */ @@ -357,15 +354,15 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, Console::error('Failed to restart pub/sub...'); }); -$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $dbPool, $redisPool, $stats, &$realtime, $logError) { +$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime, $logError) { $app = new App('UTC'); $request = new Request($request); $response = new Response(new SwooleResponse()); /** @var PDO $db */ - $db = $dbPool->get(); + $db = $register->get('dbPool')->get(); /** @var Redis $redis */ - $redis = $redisPool->get(); + $redis = $register->get('redisPool')->get(); Console::info("Connection open (user: {$connection})"); @@ -480,8 +477,8 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, /** * Put used PDO and Redis Connections back into their pools. */ - $dbPool->put($db); - $redisPool->put($redis); + $register->get('dbPool')->put($db); + $register->get('redisPool')->put($redis); } });