upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

feat: log app version

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2025-06-30 20:54:36 +02:00
parent e3f97eac11
commit d1008a5590
No known key found for this signature in database
GPG key ID: 42B69D8A64526EFB
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/private/Log.php
View file

@ -12,6 +12,7 @@ use Exception;
use Nextcloud\LogNormalizer\Normalizer;
use OC\AppFramework\Bootstrap\Coordinator;
use OC\Log\ExceptionSerializer;
use OCP\App\IAppManager;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\ILogger;
use OCP\IRequest;
@ -38,13 +39,26 @@ class Log implements ILogger, IDataLogger {
private ?bool $logConditionSatisfied = null;
private ?IEventDispatcher $eventDispatcher = null;
private int $nestingLevel = 0;
/** @var callable(): IAppManager */
private $appManagerFactory;
private ?IAppManager $appManager = null;
public function __construct(
private IWriter $logger,
private SystemConfig $config,
private Normalizer $normalizer = new Normalizer(),
private ?IRegistry $crashReporters = null,
?callable $appManagerFactory = null,
) {
$this->appManagerFactory = $appManagerFactory ?? fn() => \OCP\Server::get(IAppManager::class);
}
private function getAppManager(): IAppManager {
if (!$this->appManager) {
$this->appManager = ($this->appManagerFactory)();
}
return $this->appManager;
}
public function setEventDispatcher(IEventDispatcher $eventDispatcher): void {
@ -142,7 +156,6 @@ class Log implements ILogger, IDataLogger {
$this->log(ILogger::DEBUG, $message, $context);
}
/**
* Logs with an arbitrary level.
*
@ -158,6 +171,9 @@ class Log implements ILogger, IDataLogger {
return; // no crash reporter, no listeners, we can stop for lower log level
}
if (isset($context['app']) && $version = $this->getAppManager()->getAppVersion($context['app'])) {
$context['app_version'] = $version;
}
array_walk($context, [$this->normalizer, 'format']);
$app = $context['app'] ?? 'no app in context';

1
lib/private/Server.php
View file

@ -669,6 +669,7 @@ class Server extends ServerContainer implements IServerContainer {
$factory = new LogFactory($c, $this->get(SystemConfig::class));
$logger = $factory->get($logType);
$registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
$appManagerFactory = fn() => $c->get(IAppManager::class);
return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
});