Skip to content

[stable27] MailQueueHandler: Don't flood logs with useless messages #1604

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
nickvergessen merged 2 commits into from
Mar 21, 2024
Merged

[stable27] MailQueueHandler: Don't flood logs with useless messages #1604

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61b814e
MailQueueHandler: Don't flood logs with useless messages
marcelklehr Mar 6, 2024
971d53b
Don't rethrow InvalidArgumentException
marcelklehr Mar 14, 2024
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
Prev Previous commit
Don't rethrow InvalidArgumentException 
Co-authored-by: Côme Chilliet <[email protected]>
Signed-off-by: Marcel Klehr <[email protected]>
  • Loading branch information
@marcelklehr @come-nc @backportbot
2 people authored and backportbot[bot] committed Mar 18, 2024
commit 971d53b416b39ffa635a4bcb31333a595a9904cb
6 changes: 2 additions & 4 deletions lib/MailQueueHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,11 +466,9 @@ protected function parseEvent($lang, IEvent $event) {
foreach ($this->activityManager->getProviders() as $provider) {
try {
$event = $provider->parse($lang, $event);
} catch (\InvalidArgumentException $e) {
/* Ignore */
} catch (\Throwable $e) {
if ($e instanceof \InvalidArgumentException) {
// \InvalidArgumentException is part of the activity API, so we let it through
throw $e;
}
$this->logger->error('Error while parsing activity event', ['exception' => $e]);
}
}
Expand Down