Merge pull request #1451 from nextcloud/backport/1449/stable29

Author: Antreesy

lib/Exception/UnsupportedLogTypeException.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\LogReader\Exception;
+
+class UnsupportedLogTypeException extends \Exception {
+	public function __construct() {
+		parent::__construct('Logreader application only supports "file" log_type');
+	}
+}

lib/Log/LogIteratorFactory.php

@@ -23,6 +23,7 @@
 
 namespace OCA\LogReader\Log;
 
+use OCA\LogReader\Exception\UnsupportedLogTypeException;
 use OCP\IConfig;
 use OCP\Log\IFileBased;
 use OCP\Log\ILogFactory;
@@ -44,7 +45,7 @@ public function getLogIterator(array $levels): \Iterator {
 		$timezone = $this->config->getSystemValue('logtimezone', 'UTC');
 		$logType = $this->config->getSystemValue('log_type', 'file');
 		if ($logType !== 'file') {
-			throw new \Exception('Logreader application only supports "file" log_type');
+			throw new UnsupportedLogTypeException();
 		}
 		$log = $this->logFactory->get('file');
 		if ($log instanceof IFileBased) {

lib/SetupChecks/LogErrors.php

@@ -25,6 +25,7 @@
  */
 namespace OCA\LogReader\SetupChecks;
 
+use OCA\LogReader\Exception\UnsupportedLogTypeException;
 use OCA\LogReader\Log\LogIteratorFactory;
 use OCP\IConfig;
 use OCP\IDateTimeFormatter;
@@ -57,6 +58,10 @@ public function run(): SetupResult {
 		try {
 			$logIterator = $this->logIteratorFactory->getLogIterator([self::LEVEL_WARNING,self::LEVEL_ERROR,self::LEVEL_FATAL]);
 		} catch (\Exception $e) {
+			if ($e instanceof UnsupportedLogTypeException) {
+				return SetupResult::info($e->getMessage());
+			}
+
 			return SetupResult::error(
 				$this->l10n->t('Failed to get an iterator for log entries: %s', [$e->getMessage()])
 			);