wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #17206 from nextcloud/logger-catch-exceptions

Browse source 
catch exceptions that occur during logging
This commit is contained in:
Roeland Jago Douma 2019-09-19 18:33:45 +02:00 committed by GitHub
commit b2aec1d816
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
lib/private/Log.php
View file

@ -214,24 +214,27 @@ class Log implements ILogger {
}
$message = strtr($message, $replace);
if ($level >= $minLevel) {
$this->writeLog($app, $message, $level);
try {
if ($level >= $minLevel) {
$this->writeLog($app, $message, $level);
if ($this->crashReporters !== null) {
$messageContext = array_merge(
$context,
[
'level' => $level
]
);
$this->crashReporters->delegateMessage($message, $messageContext);
}
} else {
if ($this->crashReporters !== null) {
$this->crashReporters->delegateBreadcrumb($message, 'log', $context);
if ($this->crashReporters !== null) {
$messageContext = array_merge(
$context,
[
'level' => $level
]
);
$this->crashReporters->delegateMessage($message, $messageContext);
}
} else {
if ($this->crashReporters !== null) {
$this->crashReporters->delegateBreadcrumb($message, 'log', $context);
}
}
} catch (\Throwable $e) {
// make sure we dont hard crash if logging fails
}
}
private function getLogLevel($context) {
@ -318,16 +321,20 @@ class Log implements ILogger {
array_walk($context, [$this->normalizer, 'format']);
if ($level >= $minLevel) {
if (!$this->logger instanceof IFileBased) {
$data = json_encode($data, JSON_PARTIAL_OUTPUT_ON_ERROR);
try {
if ($level >= $minLevel) {
if (!$this->logger instanceof IFileBased) {
$data = json_encode($data, JSON_PARTIAL_OUTPUT_ON_ERROR);
}
$this->writeLog($app, $data, $level);
}
$this->writeLog($app, $data, $level);
}
$context['level'] = $level;
if (!is_null($this->crashReporters)) {
$this->crashReporters->delegateReport($exception, $context);
$context['level'] = $level;
if (!is_null($this->crashReporters)) {
$this->crashReporters->delegateReport($exception, $context);
}
} catch (\Throwable $e) {
// make sure we dont hard crash if logging fails
}
}