1
0
Fork 0
mirror of synced 2024-07-04 14:10:33 +12:00

Revert "WIP fix too many connections" registry changes

This reverts commit a6ffab09df.
This commit is contained in:
Jake Barnby 2022-11-08 12:25:54 +13:00
parent a6ffab09df
commit 11c3060682
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C

View file

@ -35,9 +35,6 @@ Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
$realtime = new Realtime(); $realtime = new Realtime();
$dbPool = $register->get('dbPool');
$redisPool = $register->get('redisPool');
/** /**
* Table for statistics across all workers. * 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...'); 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'); $app = new App('UTC');
$request = new Request($request); $request = new Request($request);
$response = new Response(new SwooleResponse()); $response = new Response(new SwooleResponse());
/** @var PDO $db */ /** @var PDO $db */
$db = $dbPool->get(); $db = $register->get('dbPool')->get();
/** @var Redis $redis */ /** @var Redis $redis */
$redis = $redisPool->get(); $redis = $register->get('redisPool')->get();
Console::info("Connection open (user: {$connection})"); 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. * Put used PDO and Redis Connections back into their pools.
*/ */
$dbPool->put($db); $register->get('dbPool')->put($db);
$redisPool->put($redis); $register->get('redisPool')->put($redis);
} }
}); });