upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-04 00:25:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #43534 from nextcloud/enh/noid/log-mnor-syntax-update

Browse source
This commit is contained in:
John Molakvoæ 2024-03-16 13:21:47 +01:00 committed by GitHub
commit e2f08d9748
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
lib/private/Log.php
View file

@ -62,38 +62,22 @@ use function strtr;
* MonoLog is an example implementing this interface.
*/
class Log implements ILogger, IDataLogger {
private ?SystemConfig $config;
private ?bool $logConditionSatisfied = null;
private ?Normalizer $normalizer;
private ?IEventDispatcher $eventDispatcher;
private ?IEventDispatcher $eventDispatcher = null;
/**
* @param IWriter $logger The logger that should be used
* @param SystemConfig|null $config the system config object
* @param Normalizer|null $normalizer
* @param IRegistry|null $crashReporters
*/
public function __construct(
private IWriter $logger,
SystemConfig $config = null,
Normalizer $normalizer = null,
private ?IRegistry $crashReporters = null
private SystemConfig $config,
private ?Normalizer $normalizer = null,
private ?IRegistry $crashReporters = null
) {
// FIXME: Add this for backwards compatibility, should be fixed at some point probably
if ($config === null) {
$config = \OC::$server->getSystemConfig();
}
$this->config = $config;
// FIXME: php8.1 allows "private Normalizer $normalizer = new Normalizer()," in initializer
if ($normalizer === null) {
$this->normalizer = new Normalizer();
} else {
$this->normalizer = $normalizer;
}
$this->eventDispatcher = null;
}
public function setEventDispatcher(IEventDispatcher $eventDispatcher) {
public function setEventDispatcher(IEventDispatcher $eventDispatcher): void {
$this->eventDispatcher = $eventDispatcher;
}
@ -102,9 +86,8 @@ class Log implements ILogger, IDataLogger {
*
* @param string $message
* @param array $context
* @return void
*/
public function emergency(string $message, array $context = []) {
public function emergency(string $message, array $context = []): void {
$this->log(ILogger::FATAL, $message, $context);
}
@ -116,9 +99,8 @@ class Log implements ILogger, IDataLogger {
*
* @param string $message
* @param array $context
* @return void
*/
public function alert(string $message, array $context = []) {
public function alert(string $message, array $context = []): void {
$this->log(ILogger::ERROR, $message, $context);
}
@ -129,9 +111,8 @@ class Log implements ILogger, IDataLogger {
*
* @param string $message
* @param array $context
* @return void
*/
public function critical(string $message, array $context = []) {
public function critical(string $message, array $context = []): void {
$this->log(ILogger::ERROR, $message, $context);
}
@ -141,9 +122,8 @@ class Log implements ILogger, IDataLogger {
*
* @param string $message
* @param array $context
* @return void
*/
public function error(string $message, array $context = []) {
public function error(string $message, array $context = []): void {
$this->log(ILogger::ERROR, $message, $context);
}
@ -155,9 +135,8 @@ class Log implements ILogger, IDataLogger {
*
* @param string $message
* @param array $context
* @return void
*/
public function warning(string $message, array $context = []) {
public function warning(string $message, array $context = []): void {
$this->log(ILogger::WARN, $message, $context);
}
@ -166,9 +145,8 @@ class Log implements ILogger, IDataLogger {
*
* @param string $message
* @param array $context
* @return void
*/
public function notice(string $message, array $context = []) {
public function notice(string $message, array $context = []): void {
$this->log(ILogger::INFO, $message, $context);
}
@ -179,9 +157,8 @@ class Log implements ILogger, IDataLogger {
*
* @param string $message
* @param array $context
* @return void
*/
public function info(string $message, array $context = []) {
public function info(string $message, array $context = []): void {
$this->log(ILogger::INFO, $message, $context);
}
@ -190,9 +167,8 @@ class Log implements ILogger, IDataLogger {
*
* @param string $message
* @param array $context
* @return void
*/
public function debug(string $message, array $context = []) {
public function debug(string $message, array $context = []): void {
$this->log(ILogger::DEBUG, $message, $context);
}
@ -203,9 +179,8 @@ class Log implements ILogger, IDataLogger {
* @param int $level
* @param string $message
* @param array $context
* @return void
*/
public function log(int $level, string $message, array $context = []) {
public function log(int $level, string $message, array $context = []): void {
$minLevel = $this->getLogLevel($context);
if ($level < $minLevel
&& (($this->crashReporters?->hasReporters() ?? false) === false)
@ -247,7 +222,7 @@ class Log implements ILogger, IDataLogger {
}
}
public function getLogLevel($context) {
public function getLogLevel($context): int {
$logCondition = $this->config->getValue('log.condition', []);
/**
@ -297,20 +272,16 @@ class Log implements ILogger, IDataLogger {
}
if (isset($context['app'])) {
$app = $context['app'];
/**
* check log condition based on the context of each log message
* once this is met -> change the required log level to debug
*/
if (!empty($logCondition)
&& isset($logCondition['apps'])
&& in_array($app, $logCondition['apps'], true)) {
if (in_array($context['app'], $logCondition['apps'] ?? [], true)) {
return ILogger::DEBUG;
}
}
return min($this->config->getValue('loglevel', ILogger::WARN), ILogger::FATAL);
return min($this->config->getValue('loglevel', ILogger::WARN) ?? ILogger::WARN, ILogger::FATAL);
}
/**
@ -321,7 +292,7 @@ class Log implements ILogger, IDataLogger {
* @return void
* @since 8.2.0
*/
public function logException(Throwable $exception, array $context = []) {
public function logException(Throwable $exception, array $context = []): void {
$app = $context['app'] ?? 'no app in context';
$level = $context['level'] ?? ILogger::ERROR;
@ -395,7 +366,7 @@ class Log implements ILogger, IDataLogger {
* @param string|array $entry
* @param int $level
*/
protected function writeLog(string $app, $entry, int $level) {
protected function writeLog(string $app, $entry, int $level): void {
$this->logger->write($app, $entry, $level);
}