X Tutup
Skip to content

Fix handling of logger calls in lib/private/Log.php #40844

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
phil-davis merged 3 commits into from
Jun 20, 2023
Merged

Fix handling of logger calls in lib/private/Log.php #40844

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40ae632
Fix handling of logger calls in lib/private/Log.php
phil-davis Jun 20, 2023
5965fd9
Add acceptance test for background:queue:execute
phil-davis Jun 20, 2023
0c41e5c
Throw an exception if no logger method is available
phil-davis Jun 20, 2023
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
Next Next commit
Fix handling of logger calls in lib/private/Log.php
  • Loading branch information
@phil-davis
phil-davis committed Jun 20, 2023
commit 40ae632f5d942b75be59dfcf3f199fbe7865eaab
5 changes: 5 additions & 0 deletions changelog/unreleased/40844
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Bugfix: verbose command output

Verbose command output of the background:queue:execute is now displayed.

https://github.com/owncloud/core/pull/40844
6 changes: 4 additions & 2 deletions lib/private/Log.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,11 +393,13 @@ public function log($level, $message, array $context = []) {

if ($level >= $minLevel) {
$logger = $this->logger;
// check if logger supports extra fields
// check if logger supports extra fields, and which method is available
if (!empty($extraFields) && \is_callable([$logger, 'writeExtra'])) {
\call_user_func([$logger, 'writeExtra'], $app, $formattedMessage, $level, $logConditionFile, $extraFields);
} else {
} elseif (\is_callable([$logger, 'write'])) {
\call_user_func([$logger, 'write'], $app, $formattedMessage, $level, $logConditionFile);
} elseif (\is_callable([$logger, 'log'])) {
\call_user_func([$logger, 'log'], $level, $formattedMessage, $context);
}
}

Expand Down
X Tutup