7 files changed, 21 insertions, 5 deletions
diff --git a/lib/private/Log/ErrorHandler.php b/lib/private/Log/ErrorHandler.php
index e1faf336118..6597274a868 100644
--- a/lib/private/Log/ErrorHandler.php
+++ b/lib/private/Log/ErrorHandler.php
@@ -72,9 +72,9 @@ class ErrorHandler {
 
 	private static function errnoToLogLevel(int $errno): int {
 		return match ($errno) {
-			E_USER_WARNING => ILogger::WARN,
+			E_WARNING, E_USER_WARNING => ILogger::WARN,
 			E_DEPRECATED, E_USER_DEPRECATED => ILogger::DEBUG,
-			E_USER_NOTICE => ILogger::INFO,
+			E_NOTICE, E_USER_NOTICE => ILogger::INFO,
 			default => ILogger::ERROR,
 		};
 	}
diff --git a/lib/private/Log/ExceptionSerializer.php b/lib/private/Log/ExceptionSerializer.php
index 6d94bf51f45..af7c9e48435 100644
--- a/lib/private/Log/ExceptionSerializer.php
+++ b/lib/private/Log/ExceptionSerializer.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/lib/private/Log/LogDetails.php b/lib/private/Log/LogDetails.php
index 8c1efaea20d..6063b25cef9 100644
--- a/lib/private/Log/LogDetails.php
+++ b/lib/private/Log/LogDetails.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/lib/private/Log/LogFactory.php b/lib/private/Log/LogFactory.php
index bbe77de198c..ee6054b81f8 100644
--- a/lib/private/Log/LogFactory.php
+++ b/lib/private/Log/LogFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/lib/private/Log/Rotate.php b/lib/private/Log/Rotate.php
index 839c40726b7..ee1593b87ac 100644
--- a/lib/private/Log/Rotate.php
+++ b/lib/private/Log/Rotate.php
@@ -7,6 +7,8 @@
  */
 namespace OC\Log;
 
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\TimedJob;
 use OCP\IConfig;
 use OCP\Log\RotationTrait;
 use Psr\Log\LoggerInterface;
@@ -17,9 +19,15 @@ use Psr\Log\LoggerInterface;
  * For more professional log management set the 'logfile' config to a different
  * location and manage that with your own tools.
  */
-class Rotate extends \OCP\BackgroundJob\Job {
+class Rotate extends TimedJob {
 	use RotationTrait;
 
+	public function __construct(ITimeFactory $time) {
+		parent::__construct($time);
+
+		$this->setInterval(3600);
+	}
+
 	public function run($argument): void {
 		$config = \OCP\Server::get(IConfig::class);
 		$this->filePath = $config->getSystemValueString('logfile', $config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log');
diff --git a/lib/private/Log/Syslog.php b/lib/private/Log/Syslog.php
index bd2c39509b1..46214599eb8 100644
--- a/lib/private/Log/Syslog.php
+++ b/lib/private/Log/Syslog.php
@@ -20,15 +20,18 @@ class Syslog extends LogDetails implements IWriter {
 		ILogger::FATAL => LOG_CRIT,
 	];
 
+	private string $tag;
+
 	public function __construct(
 		SystemConfig $config,
 		?string $tag = null,
 	) {
 		parent::__construct($config);
 		if ($tag === null) {
-			$tag = $config->getValue('syslog_tag', 'Nextcloud');
+			$this->tag = $config->getValue('syslog_tag', 'Nextcloud');
+		} else {
+			$this->tag = $tag;
 		}
-		openlog($tag, LOG_PID | LOG_CONS, LOG_USER);
 	}
 
 	public function __destruct() {
@@ -41,6 +44,7 @@ class Syslog extends LogDetails implements IWriter {
 	 */
 	public function write(string $app, $message, int $level): void {
 		$syslog_level = $this->levels[$level];
+		openlog($this->tag, LOG_PID | LOG_CONS, LOG_USER);
 		syslog($syslog_level, $this->logDetailsAsJSON($app, $message, $level));
 	}
 }
diff --git a/lib/private/Log/Systemdlog.php b/lib/private/Log/Systemdlog.php
index 46de0f7db97..ffea0511732 100644
--- a/lib/private/Log/Systemdlog.php
+++ b/lib/private/Log/Systemdlog.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later