From 7bd16180c3c9903e032f923184d4f2aba51dd166 Mon Sep 17 00:00:00 2001 From: shimon Date: Wed, 2 Nov 2022 11:45:52 +0200 Subject: [PATCH] addressing comments --- app/worker.php | 50 +--------------------------------------- app/workers/sync-out.php | 1 + 2 files changed, 2 insertions(+), 49 deletions(-) diff --git a/app/worker.php b/app/worker.php index 77f78c3096..e1d46d4f46 100644 --- a/app/worker.php +++ b/app/worker.php @@ -58,56 +58,8 @@ App::setResource('logger', function ($register) { return $register->get('logger'); }, ['register']); -Server::setResource('ErrorLog', function (Logger $logger) { - return function (Throwable $error, $action) use ($logger) { - - if ($logger) { - $version = App::getEnv('_APP_VERSION', 'UNKNOWN'); - - if ($error->getCode() >= 500 || $error->getCode() === 0) { - $log = new Log(); - - $log->setNamespace("http"); - $log->setServer(\gethostname()); - $log->setVersion($version); - $log->setType(Log::TYPE_ERROR); - $log->setMessage($error->getMessage()); - - $log->setAction($action); - - $log->addTag('verboseType', get_class($error)); - $log->addTag('code', $error->getCode()); - - $log->addExtra('file', $error->getFile()); - $log->addExtra('line', $error->getLine()); - $log->addExtra('trace', $error->getTraceAsString()); - $log->addExtra('detailedTrace', $error->getTrace()); - $log->addExtra('roles', Authorization::$roles); - - $isProduction = App::getEnv('_APP_ENV', 'development') === 'production'; - $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING); - - $responseCode = $logger->addLog($log); - Console::info('Log pushed with status code: ' . $responseCode); - } - } - - $code = $error->getCode(); - $message = $error->getMessage(); - $file = $error->getFile(); - $line = $error->getLine(); - $trace = $error->getTrace(); - - Console::error('[Error] Timestamp: ' . date('c', time())); - Console::error('[Error] Type: ' . get_class($error)); - Console::error('[Error] Message: ' . $message); - Console::error('[Error] File: ' . $file); - Console::error('[Error] Line: ' . $line); - Console::error('[Error] Code: ' . $code); - Console::error('[Error] Trace: ' . $trace); - }; -}); +// Todo better job to inject the client as a resource $fallbackForRedis = AppwriteURL::unparse([ 'scheme' => 'redis', 'host' => App::getEnv('_APP_REDIS_HOST', 'redis'), diff --git a/app/workers/sync-out.php b/app/workers/sync-out.php index fa15114580..b8d55d212c 100644 --- a/app/workers/sync-out.php +++ b/app/workers/sync-out.php @@ -139,6 +139,7 @@ $server ->inject('register') ->action(function ($error, $logger, $register) { + // Todo better job of abstracting the error log $version = App::getEnv('_APP_VERSION', 'UNKNOWN'); if ($error instanceof PDOException) {