Skip to content

[stable19] Respect the error level when logging #26769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 2 commits into from
Apr 26, 2021
Merged

[stable19] Respect the error level when logging #26769

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3e4bfb
Respect the error level when logging
nickvergessen Apr 26, 2021
59ab209
Log deprecation only as debug
nickvergessen Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Respect the error level when logging 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot
nickvergessen authored and backportbot[bot] committed Apr 26, 2021
commit e3e4bfb163d4dc5aaee77567e290fbec0071d169
19 changes: 17 additions & 2 deletions lib/private/Log/ErrorHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,28 @@ public static function onError($number, $message, $file, $line) {
}
$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;
}
}
}