sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(setup): ignore long session login during installation 

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
pull/47521/head
Maxence Lange 2024-08-27 12:29:04 +07:00
parent b8b5f2c8aa
commit 9100b8757e
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/base.php
Unescape Escape View File

@ -387,10 +387,15 @@ class OC {
$sessionName = OC_Util::getInstanceId(); $sessionName = OC_Util::getInstanceId();
try { 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 // set the session name to the instance id - which is unique
$session = new \OC\Session\Internal( $session = new \OC\Session\Internal(
$sessionName, $sessionName,
logger('core'), $logger,
); );
$cryptoWrapper = Server::get(\OC\Session\CryptoWrapper::class); $cryptoWrapper = Server::get(\OC\Session\CryptoWrapper::class);

8
lib/private/Session/Internal.php
Unescape Escape View File

@ -29,8 +29,10 @@ class Internal extends Session {
* @param string $name * @param string $name
* @throws \Exception * @throws \Exception
*/ */
public function __construct(string $name, public function __construct(
private LoggerInterface $logger) { string $name,
private ?LoggerInterface $logger,
) {
set_error_handler([$this, 'trapError']); set_error_handler([$this, 'trapError']);
$this->invoke('session_name', [$name]); $this->invoke('session_name', [$name]);
$this->invoke('session_cache_limiter', ['']); $this->invoke('session_cache_limiter', ['']);
@ -204,7 +206,7 @@ class Internal extends Session {
$timeSpent > 0.5 => ILogger::INFO, $timeSpent > 0.5 => ILogger::INFO,
default => ILogger::DEBUG, default => ILogger::DEBUG,
}; };
$this->logger->log( $this->logger?->log(
$logLevel, $logLevel,
"Slow session operation $functionName detected", "Slow session operation $functionName detected",
[ [