upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

fix: Put back ScopedPsrLogger service

Browse source 
Cannot use an alias for this one, as it depends upon LoggerInterface so
 that creates an infinite loop.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2025-06-19 14:02:30 +02:00
parent bbe766b07a
commit 2240acec7f
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/private/AppFramework/DependencyInjection/DIContainer.php
View file

@ -25,6 +25,7 @@ use OC\AppFramework\ScopedPsrLogger;
use OC\AppFramework\Utility\SimpleContainer;
use OC\Core\Middleware\TwoFactorMiddleware;
use OC\Diagnostics\EventLogger;
use OC\Log\PsrLoggerAdapter;
use OC\ServerContainer;
use OC\Settings\AuthorizedGroupMapper;
use OCA\WorkflowEngine\Manager;
@ -34,6 +35,7 @@ use OCP\AppFramework\QueryException;
use OCP\AppFramework\Services\IAppConfig;
use OCP\AppFramework\Services\IInitialState;
use OCP\AppFramework\Utility\IControllerMethodReflector;
use OCP\Files\AppData\IAppDataFactory;
use OCP\Files\Folder;
use OCP\Files\IAppData;
use OCP\Group\ISubAdmin;
@ -90,7 +92,7 @@ class DIContainer extends SimpleContainer implements IAppContainer {
});
$this->registerService(IAppData::class, function (ContainerInterface $c): IAppData {
return $c->get(\OCP\Files\AppData\IAppDataFactory::class)->get($c->get('appName'));
return $c->get(IAppDataFactory::class)->get($c->get('appName'));
});
$this->registerService(IL10N::class, function (ContainerInterface $c) {
@ -98,7 +100,13 @@ class DIContainer extends SimpleContainer implements IAppContainer {
});
// Log wrappers
$this->registerAlias(LoggerInterface::class, ScopedPsrLogger::class);
$this->registerService(LoggerInterface::class, function (ContainerInterface $c) {
/* Cannot be an alias because it uses LoggerInterface so it would infinite loop */
return new ScopedPsrLogger(
$c->get(PsrLoggerAdapter::class),
$c->get('appName')
);
});
$this->registerService(IServerContainer::class, function () {
return $this->getServer();