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

fix(logger): Fix calls to log normalizer

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2025-12-17 13:20:07 +01:00
parent e863c3c500
commit 121973d336
No known key found for this signature in database
GPG key ID: F72FA5B49FFA96B0
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/private/Log.php
View file

@ -342,14 +342,14 @@ class Log implements ILogger, IDataLogger {
$this->error('Failed to load ExceptionSerializer serializer while trying to log ' . $exception->getMessage());
return;
}
$context = array_map($this->normalizer->format(...), $context);
$data = $context;
unset($data['app']);
unset($data['level']);
unset($data['app'], $data['level']);
$data = array_merge($serializer->serializeException($exception), $data);
$data = $this->interpolateMessage($data, isset($context['message']) && $context['message'] !== '' ? $context['message'] : ('Exception thrown: ' . get_class($exception)), 'CustomMessage');
array_walk($context, [$this->normalizer, 'format']);
$this->eventDispatcher?->dispatchTyped(new BeforeMessageLoggedEvent($app, $level, $data));
try {
@ -374,8 +374,7 @@ class Log implements ILogger, IDataLogger {
$level = $context['level'] ?? ILogger::ERROR;
$minLevel = $this->getLogLevel($context, $message);
array_walk($context, [$this->normalizer, 'format']);
$data = array_map($this->normalizer->format(...), $data);
try {
if ($level >= $minLevel) {
@ -385,8 +384,6 @@ class Log implements ILogger, IDataLogger {
}
$this->writeLog($app, $data, $level);
}
$context['level'] = $level;
} catch (Throwable $e) {
// make sure we dont hard crash if logging fails
error_log('Error when trying to log exception: ' . $e->getMessage() . ' ' . $e->getTraceAsString());