diff --git a/app/console b/app/console index 43891a526e..b1a81a390a 160000 --- a/app/console +++ b/app/console @@ -1 +1 @@ -Subproject commit 43891a526e061454617cbb13def3c4901d99a7f1 +Subproject commit b1a81a390a05746701651fca49e0d853f430677c diff --git a/app/init.php b/app/init.php index 09a1062d47..86c7ebaa63 100644 --- a/app/init.php +++ b/app/init.php @@ -1093,10 +1093,10 @@ App::setResource('cache', function (Group $pools, Client $queueForCacheSyncOut) $cache = new Cache(new Sharding($adapters)); $cache->on(cache::EVENT_SAVE, function ($key) use ($queueForCacheSyncOut) { - //Todo fix cache re-invoked - if ($key === 'cache-console:_metadata:users') { - return; - } +// //Todo fix cache re-invoked +// if ($key === 'cache-console:_metadata:users') { +// return; +// } $queueForCacheSyncOut ->enqueue([ 'key' => $key @@ -1104,9 +1104,9 @@ App::setResource('cache', function (Group $pools, Client $queueForCacheSyncOut) }); $cache->on(cache::EVENT_PURGE, function ($key) use ($queueForCacheSyncOut) { - if ($key === 'cache-console:_metadata:users') { - return; - } +// if ($key === 'cache-console:_metadata:users') { +// return; +// } $queueForCacheSyncOut ->enqueue([ 'key' => $key diff --git a/app/workers/sync-In.php b/app/workers/sync-In.php index 4eab3be337..c5314ef1ed 100644 --- a/app/workers/sync-In.php +++ b/app/workers/sync-In.php @@ -8,9 +8,6 @@ use Utopia\CLI\Console; use Utopia\Database\DateTime; use Utopia\Queue\Message; -global $connection; -global $workerNumber; - $server->job() ->inject('message') ->inject('cache') diff --git a/app/workers/sync-out.php b/app/workers/sync-out.php index 12f8db3aa0..7601dbca2e 100644 --- a/app/workers/sync-out.php +++ b/app/workers/sync-out.php @@ -15,9 +15,6 @@ use Utopia\Database\Exception\Authorization; use Utopia\Database\Exception\Structure; use Utopia\Queue\Message; -global $connection; -global $workerNumber; - $regions = array_filter( Config::getParam('regions', []), fn ($region) => App::getEnv('_APP_REGION') !== $region @@ -76,7 +73,7 @@ function call(string $url, string $token, array $stack): array /** * @throws Authorization * @throws Structure - * @throws Exception + * @throws Exception|\Exception */ function handle($dbForConsole, $regions, $stack): void { diff --git a/docker-compose.yml b/docker-compose.yml index 440fd059bb..43e9f48ad2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -281,6 +281,8 @@ services: - _APP_DB_SCHEMA - _APP_DB_USER - _APP_DB_PASS + - _APP_CONNECTIONS_MAX + - _APP_POOL_CLIENTS - _APP_CONNECTIONS_DB_PROJECT - _APP_CONNECTIONS_DB_CONSOLE - _APP_CONNECTIONS_CACHE @@ -311,6 +313,8 @@ services: - _APP_CONNECTIONS_DB_PROJECT - _APP_CONNECTIONS_DB_CONSOLE - _APP_CONNECTIONS_CACHE + - _APP_CONNECTIONS_MAX + - _APP_POOL_CLIENTS - _APP_CONNECTIONS_QUEUE - _APP_WORKER_PER_CORE - _APP_REGION @@ -667,6 +671,8 @@ services: - _APP_DB_SCHEMA - _APP_DB_USER - _APP_DB_PASS + - _APP_CONNECTIONS_MAX + - _APP_POOL_CLIENTS - _APP_SYNC_EDGE_INTERVAL - _APP_CONNECTIONS_DB_PROJECT - _APP_CONNECTIONS_DB_CONSOLE