mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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
parent f750193920 2943c18548
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

9
lib/private/Log.php
View File

@ -214,6 +214,7 @@ class Log implements ILogger {
}
$message = strtr($message, $replace);
try {
if ($level >= $minLevel) {
$this->writeLog($app, $message, $level);
@ -231,7 +232,9 @@ class Log implements ILogger {
$this->crashReporters->delegateBreadcrumb($message, 'log', $context);
}
}
} catch (\Throwable $e) {
// make sure we dont hard crash if logging fails
}
}
private function getLogLevel($context) {
@ -318,6 +321,7 @@ class Log implements ILogger {
array_walk($context, [$this->normalizer, 'format']);
try {
if ($level >= $minLevel) {
if (!$this->logger instanceof IFileBased) {
$data = json_encode($data, JSON_PARTIAL_OUTPUT_ON_ERROR);
@ -329,6 +333,9 @@ class Log implements ILogger {
if (!is_null($this->crashReporters)) {
$this->crashReporters->delegateReport($exception, $context);
}
} catch (\Throwable $e) {
// make sure we dont hard crash if logging fails
}
}
/**