Skip to content

Commit b6f9536

Browse files
authored
Merge pull request #26766 from nextcloud/backport/26762/stable21
2 parents 49d3fdf + d1756dd commit b6f9536

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

lib/private/Log/ErrorHandler.php

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,30 @@ public static function onError($number, $message, $file, $line) {
9090
}
9191
$msg = $message . ' at ' . $file . '#' . $line;
9292
$e = new \Error(self::removePassword($msg));
93-
self::$logger->logException($e, ['app' => 'PHP']);
93+
self::$logger->logException($e, ['app' => 'PHP', 'level' => self::errnoToLogLevel($number)]);
9494
}
9595

9696
//Recoverable handler which catch all errors, warnings and notices
9797
public static function onAll($number, $message, $file, $line) {
9898
$msg = $message . ' at ' . $file . '#' . $line;
9999
$e = new \Error(self::removePassword($msg));
100-
self::$logger->logException($e, ['app' => 'PHP', 'level' => 0]);
100+
self::$logger->logException($e, ['app' => 'PHP', 'level' => self::errnoToLogLevel($number)]);
101+
}
102+
103+
public static function errnoToLogLevel(int $errno): int {
104+
switch ($errno) {
105+
case E_USER_WARNING:
106+
return ILogger::WARN;
107+
108+
case E_USER_DEPRECATED:
109+
return ILogger::DEBUG;
110+
111+
case E_USER_NOTICE:
112+
return ILogger::INFO;
113+
114+
case E_USER_ERROR:
115+
default:
116+
return ILogger::ERROR;
117+
}
101118
}
102119
}

0 commit comments

Comments
 (0)