Skip to content

Move exception logging to separate field #27451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Jun 10, 2021
Merged

Move exception logging to separate field #27451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Move exception logging to separate field 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Jun 10, 2021
commit e536b7bbcc8a80a62592112a2214d61c2501e0c5
14 changes: 9 additions & 5 deletions lib/private/Log/LogDetails.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,17 @@ public function logDetails(string $app, $message, int $level): array {
'version'
);

if (is_array($message) && !array_key_exists('Exception', $message)) {
// Exception messages should stay as they are,
if (is_array($message)) {
// Exception messages are extracted and the exception is put into a separate field
// anything else modern is split to 'message' (string) and
// data (array) fields
$shortMessage = $message['message'] ?? '(no message provided)';
$entry['data'] = $message;
$entry['message'] = $shortMessage;
if (array_key_exists('Exception', $message)) {
$entry['exception'] = $message;
$entry['message'] = $message['CustomMessage'] !== '--' ? $message['CustomMessage'] : $message['Message'];
} else {
$entry['data'] = $message;
$entry['message'] = $message['message'] ?? '(no message provided)';
}
}

return $entry;
Expand Down