PR review changes
This commit is contained in:
parent
ac64cde0a2
commit
bd9d777717
|
@ -301,23 +301,21 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project, $l
|
|||
/** @var Utopia\Logger\Logger $logger */
|
||||
/** @var Utopia\Logger\Log\Breadcrumb[] $loggerBreadcrumbs */
|
||||
|
||||
$user = null;
|
||||
/** @var Appwrite\Database\Document $user */
|
||||
|
||||
try {
|
||||
$user = $utopia->getResource('user');
|
||||
} catch(\Throwable $th) {
|
||||
// All good, user is optional information for logger
|
||||
}
|
||||
|
||||
$version = App::getEnv('_APP_VERSION', 'UNKNOWN');
|
||||
$route = $utopia->match($request);
|
||||
|
||||
if($logger) {
|
||||
if($error->getCode() >= 500 || $error->getCode() === 0) {
|
||||
try {
|
||||
$user = $utopia->getResource('user');
|
||||
/** @var Appwrite\Database\Document $user */
|
||||
} catch(\Throwable $th) {
|
||||
// All good, user is optional information for logger
|
||||
}
|
||||
|
||||
$log = new Utopia\Logger\Log();
|
||||
|
||||
if($user !== null && !$user->isEmpty()) {
|
||||
if(isset($user) && !$user->isEmpty()) {
|
||||
$log->setUser(new User($user->getId()));
|
||||
}
|
||||
|
||||
|
|
|
@ -98,21 +98,21 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
|
|||
} catch (\Throwable $th) {
|
||||
$version = App::getEnv('_APP_VERSION', 'UNKNOWN');
|
||||
|
||||
$user = null;
|
||||
$logger = $app->getResource("logger");
|
||||
if($logger) {
|
||||
try {
|
||||
$user = $app->getResource('user');
|
||||
/** @var Appwrite\Database\Document $user */
|
||||
} catch(\Throwable $_th) {
|
||||
// All good, user is optional information for logger
|
||||
}
|
||||
|
||||
$logger = $app->getResource("logger");
|
||||
if($logger) {
|
||||
$loggerBreadcrumbs = $app->getResource("loggerBreadcrumbs");
|
||||
$route = $app->match($request);
|
||||
|
||||
$log = new Utopia\Logger\Log();
|
||||
|
||||
if($user !== null && !$user->isEmpty()) {
|
||||
if(isset($user) && !$user->isEmpty()) {
|
||||
$log->setUser(new User($user->getId()));
|
||||
}
|
||||
|
||||
|
|
|
@ -79,6 +79,11 @@ $logError = function(Throwable $error, string $action) use ($register) {
|
|||
|
||||
$responseCode = $logger->addLog($log);
|
||||
Console::info('Realtime log pushed with status code: '.$responseCode);
|
||||
|
||||
Console::error('[Error] Type: ' . get_class($error));
|
||||
Console::error('[Error] Message: ' . $error->getMessage());
|
||||
Console::error('[Error] File: ' . $error->getFile());
|
||||
Console::error('[Error] Line: ' . $error->getLine());
|
||||
};
|
||||
|
||||
$server->error($logError);
|
||||
|
@ -126,11 +131,6 @@ $server->onStart(function () use ($stats, $register, $containerId, &$documentId,
|
|||
$documentId = $document->getId();
|
||||
} catch (\Throwable $th) {
|
||||
call_user_func($logError, $th, "createWorkerDocument");
|
||||
|
||||
Console::error('[Error] Type: ' . get_class($th));
|
||||
Console::error('[Error] Message: ' . $th->getMessage());
|
||||
Console::error('[Error] File: ' . $th->getFile());
|
||||
Console::error('[Error] Line: ' . $th->getLine());
|
||||
} finally {
|
||||
call_user_func($returnConsoleDb);
|
||||
}
|
||||
|
@ -191,11 +191,6 @@ $server->onStart(function () use ($stats, $register, $containerId, &$documentId,
|
|||
]);
|
||||
} catch (\Throwable $th) {
|
||||
call_user_func($logError, $th, "updateWorkerDocument");
|
||||
|
||||
Console::error('[Error] Type: ' . get_class($th));
|
||||
Console::error('[Error] Message: ' . $th->getMessage());
|
||||
Console::error('[Error] File: ' . $th->getFile());
|
||||
Console::error('[Error] Line: ' . $th->getLine());
|
||||
} finally {
|
||||
call_user_func($returnConsoleDb);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue