From 0afa5aba633b593233b4a006ed4dae250aa229ba Mon Sep 17 00:00:00 2001 From: Art4 Date: Thu, 26 Dec 2024 08:10:06 +0000 Subject: [PATCH] Setup container with explicit LogChannel --- src/App.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/App.php b/src/App.php index ae9a6334e3..b5711589a0 100644 --- a/src/App.php +++ b/src/App.php @@ -125,6 +125,8 @@ class App { $this->setupContainerForAddons(); + $this->setupContainerForLogger(LogChannel::DEFAULT); + $this->container = $this->container->addRule(Mode::class, [ 'call' => [ ['determineRunMode', [false, $request->getServerParams()], Dice::CHAIN_CALL], @@ -170,9 +172,7 @@ class App { $this->setupContainerForAddons(); - $this->container = $this->container->addRule(LoggerInterface::class,[ - 'constructParams' => [LogChannel::AUTH_JABBERED], - ]); + $this->setupContainerForLogger(LogChannel::AUTH_JABBERED); $this->setupLegacyServerLocator(); @@ -194,9 +194,7 @@ class App { $this->setupContainerForAddons(); - $this->container = $this->container->addRule(LoggerInterface::class, [ - 'constructParams' => [LogChannel::CONSOLE], - ]); + $this->setupContainerForLogger(LogChannel::CONSOLE); $this->setupLegacyServerLocator(); @@ -213,6 +211,13 @@ class App $this->container = $this->container->addRules($addonLoader->getActiveAddonConfig('dependencies')); } + private function setupContainerForLogger(string $logChannel): void + { + $this->container = $this->container->addRule(LoggerInterface::class, [ + 'constructParams' => [$logChannel], + ]); + } + private function setupLegacyServerLocator(): void { \Friendica\DI::init($this->container);