Merge pull request #47549 from nextcloud/backport/47521/stable29

[stable29] fix(logger): ignore session logging during setup
nextcloud · Aug 28, 2024 · 469e458 · 469e458
2 parents 5f77364 + 135b270
commit 469e458
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/base.php b/lib/base.php
@@ -448,10 +448,15 @@ public static function initSession(): void {
 		$sessionName = OC_Util::getInstanceId();
 
 		try {
+			$logger = null;
+			if (Server::get(\OC\SystemConfig::class)->getValue('installed', false)) {
+				$logger = logger('core');
+			}
+
 			// set the session name to the instance id - which is unique
 			$session = new \OC\Session\Internal(
 				$sessionName,
-				logger('core'),
+				$logger,
 			);
 
 			$cryptoWrapper = Server::get(\OC\Session\CryptoWrapper::class);

diff --git a/lib/private/Session/Internal.php b/lib/private/Session/Internal.php
@@ -53,8 +53,10 @@ class Internal extends Session {
 	 * @param string $name
 	 * @throws \Exception
 	 */
-	public function __construct(string $name,
-		private LoggerInterface $logger) {
+	public function __construct(
+		string $name,
+		private ?LoggerInterface $logger,
+	) {
 		set_error_handler([$this, 'trapError']);
 		$this->invoke('session_name', [$name]);
 		$this->invoke('session_cache_limiter', ['']);
@@ -228,7 +230,7 @@ private function invoke(string $functionName, array $parameters = [], bool $sile
 					$timeSpent > 0.5 => ILogger::INFO,
 					default => ILogger::DEBUG,
 				};
-				$this->logger->log(
+				$this->logger?->log(
 					$logLevel,
 					"Slow session operation $functionName detected",
 					[