fix(setup): ignore long session login during installation

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

diff --git a/lib/base.php b/lib/base.php
index bf324e946bc509b705ba35457b18c8b85e2ed647..4e66d389e7b12f97d23bd95f285ec07d2aa7bdbf 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -387,10 +387,15 @@ class OC {
                $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
index 5398dc710af9c39d8fde2060489c0dbec05066ef..b465bcd3edadbf7bfebf8aeb2286aa19479d91bd 100644 (file)
--- a/lib/private/Session/Internal.php
+++ b/lib/private/Session/Internal.php
@@ -29,8 +29,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', ['']);
@@ -204,7 +206,7 @@ class Internal extends Session {
                                        $timeSpent > 0.5 => ILogger::INFO,
                                        default => ILogger::DEBUG,
                                };
-                               $this->logger->log(
+                               $this->logger?->log(
                                        $logLevel,
                                        "Slow session operation $functionName detected",
                                        [