From 35fc397ecc0c242d0a378515fb45646749cfd3f8 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 12 Sep 2022 16:08:29 +0200 Subject: [PATCH] fix: remove unnecessary try/catch --- app/http.php | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/app/http.php b/app/http.php index 5e514f23e1..7243fc9981 100644 --- a/app/http.php +++ b/app/http.php @@ -38,8 +38,7 @@ $http 'http_compression_level' => 6, 'package_max_length' => $payloadSize, 'buffer_output_size' => $payloadSize, - ]) -; + ]); $http->on('WorkerStart', function ($server, $workerId) { Console::success('Worker ' . ++$workerId . ' started successfully'); @@ -81,13 +80,15 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) { } } while ($attempts < $max); - App::setResource('db', fn() => $db); - App::setResource('cache', fn() => $redis); + App::setResource('db', fn () => $db); + App::setResource('cache', fn () => $redis); - $dbForConsole = $app->getResource('dbForConsole'); /** @var Utopia\Database\Database $dbForConsole */ + $dbForConsole = $app->getResource('dbForConsole'); + /** @var Utopia\Database\Database $dbForConsole */ Console::success('[Setup] - Server database init started...'); - $collections = Config::getParam('collections', []); /** @var array $collections */ + $collections = Config::getParam('collections', []); + /** @var array $collections */ if (!$dbForConsole->exists(App::getEnv('_APP_DB_SCHEMA', 'appwrite'))) { $redis->flushAll(); @@ -156,11 +157,8 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) { 'orders' => $index['orders'], ]); } - try { - $dbForConsole->createCollection($key, $attributes, $indexes); - } catch (\Throwable $th) { - Console::warning("Failed to create {$key} collection: " . $th->getMessage()); - } + + $dbForConsole->createCollection($key, $attributes, $indexes); } if ($dbForConsole->getDocument('buckets', 'default')->isEmpty() && !$dbForConsole->exists(App::getEnv('_APP_DB_SCHEMA', 'appwrite'), 'bucket_1')) { @@ -247,8 +245,7 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo ->setContentType(Files::getFileMimeType($request->getURI())) ->addHeader('Cache-Control', 'public, max-age=' . $time) ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + $time) . ' GMT') // 45 days cache - ->send(Files::getFileContents($request->getURI())) - ; + ->send(Files::getFileContents($request->getURI())); return; } @@ -258,8 +255,8 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo $db = $register->get('dbPool')->get(); $redis = $register->get('redisPool')->get(); - App::setResource('db', fn() => $db); - App::setResource('cache', fn() => $redis); + App::setResource('db', fn () => $db); + App::setResource('cache', fn () => $redis); try { Authorization::cleanRoles();