CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-27 02:31:04 +12:00
Code Issues Projects Releases Wiki Activity

PR review changes

Browse source
This commit is contained in:
Matej Baco 2021-12-27 11:35:51 +01:00
parent ac64cde0a2
commit bd9d777717
3 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/general.php
View file

@ -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()));
}

16
app/http.php
View file

@ -98,21 +98,21 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
} catch (\Throwable $th) {
$version = App::getEnv('_APP_VERSION', 'UNKNOWN');
$user = null;
try {
$user = $app->getResource('user');
} catch(\Throwable $_th) {
// All good, user is optional information for logger
}
$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
}
$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()));
}

15
app/realtime.php
View file

@ -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);
}