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

Merge pull request #26762 from nextcloud/bugfix/noid/respect-the-error-level-on-logging 

Respect the error level when logging
This commit is contained in:
Joas Schilling 2021-04-26 17:10:52 +02:00 committed by GitHub
parent aa651fd629 21ed3419f3
commit 303d689001
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/private/Log/ErrorHandler.php
View File

@ -90,13 +90,30 @@ class ErrorHandler {
} }
$msg = $message . ' at ' . $file . '#' . $line; $msg = $message . ' at ' . $file . '#' . $line;
$e = new \Error(self::removePassword($msg)); $e = new \Error(self::removePassword($msg));
self::$logger->logException($e, ['app' => 'PHP']); self::$logger->logException($e, ['app' => 'PHP', 'level' => self::errnoToLogLevel($number)]);
} }
//Recoverable handler which catch all errors, warnings and notices //Recoverable handler which catch all errors, warnings and notices
public static function onAll($number, $message, $file, $line) { public static function onAll($number, $message, $file, $line) {
$msg = $message . ' at ' . $file . '#' . $line; $msg = $message . ' at ' . $file . '#' . $line;
$e = new \Error(self::removePassword($msg)); $e = new \Error(self::removePassword($msg));
self::$logger->logException($e, ['app' => 'PHP', 'level' => 0]); self::$logger->logException($e, ['app' => 'PHP', 'level' => self::errnoToLogLevel($number)]);
}
public static function errnoToLogLevel(int $errno): int {
switch ($errno) {
case E_USER_WARNING:
return ILogger::WARN;
case E_USER_DEPRECATED:
return ILogger::DEBUG;
case E_USER_NOTICE:
return ILogger::INFO;
case E_USER_ERROR:
default:
return ILogger::ERROR;
}
} }
} }