MailQueueHandler: Don't flood logs with useless messages #1586
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Marcel Klehr <[email protected]>
|
/backport to stable28 |
|
/backport to stable27 |
nickvergessen
approved these changes
Mar 6, 2024
lib/MailQueueHandler.php
Outdated
| @@ -435,6 +435,10 @@ protected function parseEvent($lang, IEvent $event) { | |||
| try { | |||
| $event = $provider->parse($lang, $event); | |||
| } catch (\Throwable $e) { | |||
| if ($e instanceof \InvalidArgumentException) { | |||
| // \InvalidArgumentException is part of the activity API, so we let it through | |||
There was a problem hiding this comment.
This in itself is already an issue which I noticed in notifications recently. But it's something for later
There was a problem hiding this comment.
Thanks for the patch, I just happen to notice that...
Before fix
After fix
NC 27.1.7 with following enabled apps
- activity: 2.19.0
- bookmarks: 13.1.3
- cfg_share_links: 4.2.0
- cloud_federation_api: 1.10.0
- dav: 1.27.0
- epubviewer: 1.6.0
- federatedfilesharing: 1.17.0
- files: 1.22.0
- files_downloadlimit: 1.1.0
- files_external: 1.19.0
- files_pdfviewer: 2.8.0
- files_rightclick: 1.6.0
- files_sharing: 1.19.0
- files_trashbin: 1.17.0
- logreader: 2.12.0
- lookup_server_connector: 1.15.0
- nextcloud_announcements: 1.16.0
- notifications: 2.15.0
- oauth2: 1.15.2
- occweb: 0.1.1
- onlyoffice: 8.2.4
- provisioning_api: 1.17.0
- richdocuments: 8.2.5
- serverinfo: 1.17.0
- settings: 1.9.0
- sharebymail: 1.17.0
- snappymail: 2.35.3
- text: 3.8.0
- theming: 2.2.0
- theming_customcss: 1.15.0
- twofactor_backupcodes: 1.16.0
- updatenotification: 1.17.0
- viewer: 2.1.0
- workflowengine: 2.9.0
It's just me or...? 😕
1 failed test on run #1312 ↗︎
Details:
|
|||||||||||||||||||||
| Test | Artifacts | |
|---|---|---|
| Check activity listing in the sidebar > Has share activity |
Test Replay
Screenshots
|
|
Review all test suite changes for PR #1586 ↗︎
come-nc
reviewed
Mar 14, 2024
Co-authored-by: Côme Chilliet <[email protected]> Signed-off-by: Marcel Klehr <[email protected]>
come-nc
approved these changes
Mar 14, 2024
|
@marcelklehr cypress fails consitently, not sure if related |
nickvergessen
deleted the
fix/mail-queue-handler-invalid-argument-exception
branch
|
The backport to # Switch to the target branch and update it
git checkout stable28
git pull origin stable28
# Create the new backport branch
git checkout -b backport/1586/stable28
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 47f96563 65f5ae28
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/1586/stable28Error: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.