From: Joas Schilling <coding@schilljs.com>
Date: Mon, 26 Apr 2021 12:18:18 +0000 (+0200)
Subject: Respect the error level when logging
X-Git-Tag: v20.0.10RC1~14^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=56d7b1a382eec252af27a954b90acdf34c0d588b;p=nextcloud-server.git

Respect the error level when logging

Signed-off-by: Joas Schilling <coding@schilljs.com>
---

diff --git a/lib/private/Log/ErrorHandler.php b/lib/private/Log/ErrorHandler.php
index e87da0b5d83..604de67a108 100644
--- a/lib/private/Log/ErrorHandler.php
+++ b/lib/private/Log/ErrorHandler.php
@@ -89,13 +89,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;
+		}
 	}
 }