1 files changed, 16 insertions, 53 deletions

diff --git a/lib/private/Support/CrashReport/Registry.php b/lib/private/Support/CrashReport/Registry.php
index bff62705ceb..4fbbb8448ca 100644
--- a/lib/private/Support/CrashReport/Registry.php
+++ b/lib/private/Support/CrashReport/Registry.php
@@ -3,62 +3,32 @@
 declare(strict_types=1);
 
 /**
- *
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace OC\Support\CrashReport;
 
 use Exception;
 use OCP\AppFramework\QueryException;
-use OCP\ILogger;
-use OCP\IServerContainer;
+use OCP\Server;
 use OCP\Support\CrashReport\ICollectBreadcrumbs;
 use OCP\Support\CrashReport\IMessageReporter;
 use OCP\Support\CrashReport\IRegistry;
 use OCP\Support\CrashReport\IReporter;
+use Psr\Log\LoggerInterface;
 use Throwable;
+use function array_shift;
 
 class Registry implements IRegistry {
-
 	/** @var string[] */
 	private $lazyReporters = [];
 
 	/** @var IReporter[] */
 	private $reporters = [];
 
-	/** @var IServerContainer */
-	private $serverContainer;
-
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
-
 	/**
 	 * Register a reporter instance
-	 *
-	 * @param IReporter $reporter
 	 */
 	public function register(IReporter $reporter): void {
 		$this->reporters[] = $reporter;
@@ -71,10 +41,6 @@ class Registry implements IRegistry {
 	/**
 	 * Delegate breadcrumb collection to all registered reporters
 	 *
-	 * @param string $message
-	 * @param string $category
-	 * @param array $context
-	 *
 	 * @since 15.0.0
 	 */
 	public function delegateBreadcrumb(string $message, string $category, array $context = []): void {
@@ -91,7 +57,6 @@ class Registry implements IRegistry {
 	 * Delegate crash reporting to all registered reporters
 	 *
 	 * @param Exception|Throwable $exception
-	 * @param array $context
 	 */
 	public function delegateReport($exception, array $context = []): void {
 		$this->loadLazyProviders();
@@ -104,9 +69,6 @@ class Registry implements IRegistry {
 	/**
 	 * Delegate a message to all reporters that implement IMessageReporter
 	 *
-	 * @param string $message
-	 * @param array $context
-	 *
 	 * @return void
 	 */
 	public function delegateMessage(string $message, array $context = []): void {
@@ -120,20 +82,19 @@ class Registry implements IRegistry {
 	}
 
 	private function loadLazyProviders(): void {
-		$classes = $this->lazyReporters;
-		foreach ($classes as $class) {
+		while (($class = array_shift($this->lazyReporters)) !== null) {
 			try {
 				/** @var IReporter $reporter */
-				$reporter = $this->serverContainer->query($class);
+				$reporter = Server::get($class);
 			} catch (QueryException $e) {
 				/*
 				 * There is a circular dependency between the logger and the registry, so
 				 * we can not inject it. Thus the static call.
 				 */
-				\OC::$server->getLogger()->logException($e, [
-					'message' => 'Could not load lazy crash reporter: ' . $e->getMessage(),
-					'level' => ILogger::FATAL,
+				Server::get(LoggerInterface::class)->critical('Could not load lazy crash reporter: ' . $e->getMessage(), [
+					'exception' => $e,
 				]);
+				return;
 			}
 			/**
 			 * Try to register the loaded reporter. Theoretically it could be of a wrong
@@ -146,12 +107,14 @@ class Registry implements IRegistry {
 				 * There is a circular dependency between the logger and the registry, so
 				 * we can not inject it. Thus the static call.
 				 */
-				\OC::$server->getLogger()->logException($e, [
-					'message' => 'Could not register lazy crash reporter: ' . $e->getMessage(),
-					'level' => ILogger::FATAL,
+				Server::get(LoggerInterface::class)->critical('Could not register lazy crash reporter: ' . $e->getMessage(), [
+					'exception' => $e,
 				]);
 			}
 		}
-		$this->lazyReporters = [];
+	}
+
+	public function hasReporters(): bool {
+		return !empty($this->lazyReporters) || !empty($this->reporters);
 	}
 }