From 82bc740363e8d9f3c7a070444b0d1fae45f837c7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 29 Sep 2020 10:08:54 +0300
Subject: [PATCH] Logger::log - allow specifying errno bump severity of PDO
 exception log messages to E_USER_WARNING

---
 classes/logger.php   | 4 ++--
 classes/mailer.php   | 2 +-
 classes/rssutils.php | 6 +++---
 update.php           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/logger.php b/classes/logger.php
index 732f1fd5d..cdc6b240a 100755
--- a/classes/logger.php
+++ b/classes/logger.php
@@ -30,9 +30,9 @@ class Logger {
 			return false;
 	}
 
-	function log($string, $context = "") {
+	function log($errno, $errstr, $context = "") {
 		if ($this->adapter)
-			return $this->adapter->log_error(E_USER_NOTICE, $string, '', 0, $context);
+			return $this->adapter->log_error($errno, $errstr, '', 0, $context);
 		else
 			return false;
 	}
diff --git a/classes/mailer.php b/classes/mailer.php
index 2919eec79..16be16523 100644
--- a/classes/mailer.php
+++ b/classes/mailer.php
@@ -20,7 +20,7 @@ class Mailer {
 		$to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
 
 		if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL)
-			Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
+			Logger::get()->log(E_USER_NOTICE, "Sending mail from $from_combined to $to_combined [$subject]: $message");
 
 		// HOOK_SEND_MAIL plugin instructions:
 		// 1. return 1 or true if mail is handled
diff --git a/classes/rssutils.php b/classes/rssutils.php
index 35955b193..6b0ae2c32 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -176,7 +176,7 @@ class RSSUtils {
 
 						Debug::log("!! Last error: $error_message");
 
-						Logger::get()->log(
+						Logger::get()->log(E_USER_NOTICE,
 							sprintf("Update process for feed %d (%s, owner UID: %d) failed with exit code: %d (%s).",
 								$tline["id"], clean($tline["title"]), $tline["owner_uid"], $exit_code, clean($error_message)));
 					}
@@ -186,7 +186,7 @@ class RSSUtils {
 						if (!self::update_rss_feed($tline["id"], true)) {
 							global $fetch_last_error;
 
-							Logger::get()->log(
+							Logger::get()->log(E_USER_NOTICE,
 								sprintf("Update request for feed %d (%s, owner UID: %d) failed: %s.",
 									$tline["id"], clean($tline["title"]), $tline["owner_uid"], clean($fetch_last_error)));
 						}
@@ -194,7 +194,7 @@ class RSSUtils {
 						Debug::log(sprintf("<= %.4f (sec) (not using a separate process)", microtime(true) - $fstarted));
 
 					} catch (PDOException $e) {
-						Logger::get()->log_error(E_USER_NOTICE, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString());
+						Logger::get()->log_error(E_USER_WARNING, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString());
 
 						try {
 							$pdo->rollback();
diff --git a/update.php b/update.php
index 0614c6261..f62ac0355 100755
--- a/update.php
+++ b/update.php
@@ -268,7 +268,7 @@
 			Debug::log(sprintf("Exception while updating feed %d: %s (%s:%d)",
 				$options["update-feed"], $e->getMessage(), $e->getFile(), $e->getLine()));
 
-			Logger::get()->log_error(E_USER_NOTICE, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString());
+			Logger::get()->log_error(E_USER_WARNING, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString());
 
 			exit(110);
 		}