diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2021-04-26 17:10:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-26 17:10:52 +0200 |
commit | 303d689001a124fe193d39c2c61734cd383fb8a0 (patch) | |
tree | 678159cb06154b6ad06e500cbaffde217ba687df | |
parent | aa651fd629534e96432492c1a74e979b28222ce2 (diff) | |
parent | 21ed3419f383937aa913ca12bd38acb648c74347 (diff) | |
download | nextcloud-server-303d689001a124fe193d39c2c61734cd383fb8a0.tar.gz nextcloud-server-303d689001a124fe193d39c2c61734cd383fb8a0.zip |
Merge pull request #26762 from nextcloud/bugfix/noid/respect-the-error-level-on-logging
Respect the error level when logging
-rw-r--r-- | lib/private/Log/ErrorHandler.php | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/lib/private/Log/ErrorHandler.php b/lib/private/Log/ErrorHandler.php index 3f4c9ee64b1..c293c5db83d 100644 --- a/lib/private/Log/ErrorHandler.php +++ b/lib/private/Log/ErrorHandler.php @@ -90,13 +90,30 @@ class ErrorHandler { } $msg = $message . ' at ' . $file . '#' . $line; $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 public static function onAll($number, $message, $file, $line) { $msg = $message . ' at ' . $file . '#' . $line; $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; + } } } |