mirror of
https://github.com/nextcloud/server.git
synced 2026-10-25 12:15:44 +01:00
Ghassen kefi
46a4594cfc
ILogFactory::getCustomPsrLogger() gets an optional $structuredContext flag. When set, array values of the log context are written as nested data in the log entry instead of being encoded to a JSON string, so consumers can read them as fields. Values used as message placeholders are still converted to strings, and loggers without the flag, including nextcloud.log, are unchanged. Message interpolation now only replaces placeholders that occur in the message, so array values that are not placeholders are never cast to strings. Assisted-by: ClaudeCode:claude-opus-5-5 Signed-off-by: Ghassen kefi <ghassen.kefi.dev@gmail.com>
67 lines
2.0 KiB
PHP
67 lines
2.0 KiB
PHP
<?php
|
|
|
|
/**
|
|
* SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
|
|
* SPDX-License-Identifier: AGPL-3.0-or-later
|
|
*/
|
|
|
|
namespace OC\Log;
|
|
|
|
use OC\Log;
|
|
use OC\SystemConfig;
|
|
use OCP\Log\ILogFactory;
|
|
use OCP\Log\IWriter;
|
|
use Psr\Container\ContainerExceptionInterface;
|
|
use Psr\Container\ContainerInterface;
|
|
use Psr\Log\LoggerInterface;
|
|
|
|
class LogFactory implements ILogFactory {
|
|
public function __construct(
|
|
private readonly ContainerInterface $c,
|
|
private readonly SystemConfig $systemConfig,
|
|
private readonly string $serverRoot,
|
|
) {
|
|
}
|
|
|
|
/**
|
|
* @throws ContainerExceptionInterface
|
|
*/
|
|
#[\Override]
|
|
public function get(string $type):IWriter {
|
|
return match (strtolower($type)) {
|
|
'errorlog' => new Errorlog($this->systemConfig),
|
|
'syslog' => $this->c->get(Syslog::class),
|
|
'systemd' => $this->c->get(Systemdlog::class),
|
|
'file' => $this->buildLogFile(),
|
|
default => $this->buildLogFile(),
|
|
};
|
|
}
|
|
|
|
protected function createNewLogger(string $type, string $tag, string $path): IWriter {
|
|
return match (strtolower($type)) {
|
|
'errorlog' => new Errorlog($this->systemConfig, $tag),
|
|
'syslog' => new Syslog($this->systemConfig, $tag),
|
|
'systemd' => new Systemdlog($this->systemConfig, $tag),
|
|
default => $this->buildLogFile($path),
|
|
};
|
|
}
|
|
|
|
#[\Override]
|
|
public function getCustomPsrLogger(string $path, string $type = 'file', string $tag = 'Nextcloud', bool $structuredContext = false): LoggerInterface {
|
|
$log = $this->createNewLogger($type, $tag, $path);
|
|
return new PsrLoggerAdapter(
|
|
new Log($log, $this->systemConfig, structuredContext: $structuredContext)
|
|
);
|
|
}
|
|
|
|
protected function buildLogFile(string $logFile = ''): File {
|
|
$defaultLogFile = $this->systemConfig->getValue('datadirectory', $this->serverRoot . '/data') . '/nextcloud.log';
|
|
if ($logFile === '') {
|
|
$logFile = $this->systemConfig->getValue('logfile', $defaultLogFile);
|
|
}
|
|
$fallback = $defaultLogFile !== $logFile ? $defaultLogFile : '';
|
|
|
|
return new File($logFile, $fallback, $this->systemConfig);
|
|
}
|
|
}
|