From 2efff977e0aef69f40eb2367ae8ae74dcd754f9c Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 12 Mar 2021 15:16:40 +0100 Subject: [PATCH] use redis connection pool on http --- app/init.php | 7 +++---- app/realtime.php | 11 +++-------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/init.php b/app/init.php index 806bc1a71..bad2320d7 100644 --- a/app/init.php +++ b/app/init.php @@ -230,13 +230,12 @@ $register->set('redisPool', function () { return $pool; }); -$register->set('cache', function () { // Register cache connection - $redis = new Redis(); - $redis->pconnect(App::getEnv('_APP_REDIS_HOST', ''), App::getEnv('_APP_REDIS_PORT', '')); +$register->set('cache', function () use ($register) { // Register cache connection + $redis = $register->get('redisPool')->get(); $redis->setOption(Redis::OPT_READ_TIMEOUT, -1); return $redis; -}); +}, true); $register->set('smtp', function () { $mail = new PHPMailer(true); diff --git a/app/realtime.php b/app/realtime.php index 5db5724e0..3217219dc 100644 --- a/app/realtime.php +++ b/app/realtime.php @@ -5,6 +5,8 @@ require_once __DIR__ . '/init.php'; use Appwrite\Network\Validator\Origin; use Appwrite\Realtime\Realtime; use Appwrite\Utopia\Response; +use Swoole\Database\RedisConfig; +use Swoole\Database\RedisPool; use Swoole\Process; use Swoole\Http\Request; use Swoole\Http\Response as SwooleResponse; @@ -34,13 +36,6 @@ $register->set('db', function () use ($register) { return $pdo; }, true); -$register->set('cache', function () use ($register) { // Register cache connection - $redis = $register->get('redisPool')->get(); - $redis->setOption(Redis::OPT_READ_TIMEOUT, -1); - - return $redis; -}, true); - $server = new Server('0.0.0.0', 80); $server->set([ @@ -128,7 +123,7 @@ $server->on('start', function (Server $server) { }); $server->on('open', function (Server $server, Request $request) use (&$connections, &$subscriptions, &$register) { - $app = new App('America/New_York'); + $app = new App('UTC'); $connection = $request->fd; $request = new SwooleRequest($request);