CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-15 17:24:48 +12:00
Code Issues Projects Releases Wiki Activity

Error handler resources removed

Browse source
This commit is contained in:
Matej Baco 2021-12-21 16:21:30 +01:00
parent f03ab69bf3
commit ac64cde0a2
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/general.php
View file

@ -317,7 +317,7 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project, $l
if($error->getCode() >= 500 || $error->getCode() === 0) {
$log = new Utopia\Logger\Log();
if(!$user->isEmpty()) {
if($user !== null && !$user->isEmpty()) {
$log->setUser(new User($user->getId()));
}

7
app/http.php
View file

@ -101,19 +101,18 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
$user = null;
try {
$user = $app->getResource('user');
} catch(\Throwable $th) {
} catch(\Throwable $_th) {
// All good, user is optional information for logger
}
$logger = $app->getResource("logger");
if($logger) {
$loggerBreadcrumbs = $app->getResource("loggerBreadcrumbs");
$project = $app->getResource("project");
$route = $app->match($request);
$log = new Utopia\Logger\Log();
if(!$user->isEmpty()) {
if($user !== null && !$user->isEmpty()) {
$log->setUser(new User($user->getId()));
}
@ -127,7 +126,7 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
$log->addTag('url', $route->getPath());
$log->addTag('verboseType', get_class($th));
$log->addTag('code', $th->getCode());
$log->addTag('projectId', $project->getId());
// $log->addTag('projectId', $project->getId()); // TODO: Figure out how to get ProjectID, if it becomes relevant
$log->addTag('hostname', $request->getHostname());
$log->addTag('locale', (string)$request->getParam('locale', $request->getHeader('x-appwrite-locale', '')));