summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2021-04-26 14:18:18 +0200
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2021-04-26 15:12:50 +0000
commit6ed9bb36ac7dfcd6386ac51f6f00502d97b44334 (patch)
treedeab870b3f3963f9985e7181460c408256a1c593 /lib
parent49d3fdf0c1d53259ac25c33271f8456a6db42183 (diff)
downloadnextcloud-server-6ed9bb36ac7dfcd6386ac51f6f00502d97b44334.tar.gz
nextcloud-server-6ed9bb36ac7dfcd6386ac51f6f00502d97b44334.zip
Respect the error level when logging
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Log/ErrorHandler.php19
1 files changed, 17 insertions, 2 deletions
diff --git a/lib/private/Log/ErrorHandler.php b/lib/private/Log/ErrorHandler.php
index 3f4c9ee64b1..b877bd7cb19 100644
--- a/lib/private/Log/ErrorHandler.php
+++ b/lib/private/Log/ErrorHandler.php
@@ -90,13 +90,28 @@ 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:
+ case E_USER_NOTICE:
+ return ILogger::INFO;
+
+ case E_USER_ERROR:
+ default:
+ return ILogger::ERROR;
+ }
}
}