Skip to content

[stable30] fix(logger): ignore session logging during setup #47550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Aug 28, 2024
Merged

[stable30] fix(logger): ignore session logging during setup #47550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix(setup): ignore long session login during installation 
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
@ArtificialOwl @backportbot
ArtificialOwl authored and backportbot[bot] committed Aug 27, 2024
commit 5df51dbc737137b486626cb51d6dbf6b4027485d
7 changes: 6 additions & 1 deletion lib/base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,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);
Expand Down
8 changes: 5 additions & 3 deletions lib/private/Session/Internal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', ['']);
Expand Down Expand Up @@ -204,7 +206,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",
[
Expand Down