Skip to content
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.

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

MailQueueHandler: Don't flood logs with useless messages #1586

Merged

Conversation

marcelklehr
Copy link
Member

No description provided.

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Copy link
Member Author

/backport to stable28

@marcelklehr
Copy link
Member Author

/backport to stable27

@@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This in itself is already an issue which I noticed in notifications recently. But it's something for later

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the patch, I just happen to notice that...

Before fix
image

After fix
image

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...? 😕

Copy link

cypress bot commented Mar 6, 2024

1 failed test on run #1312 ↗︎

1 9 0 0 Flakiness 0

Details:

MailQueueHandler: Don't flood logs with useless messages
Project: Activity Commit: 8075bec3ee
Status: Failed Duration: 02:52 💡
Started: Mar 14, 2024 1:11 PM Ended: Mar 14, 2024 1:14 PM
Failed  cypress/e2e/sidebar.cy.ts • 1 failed test • Run E2E

View Output

Test Artifacts
Check activity listing in the sidebar > Has share activity Test Replay Screenshots

Review all test suite changes for PR #1586 ↗︎

lib/MailQueueHandler.php Outdated Show resolved Hide resolved
Co-authored-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@come-nc
Copy link
Contributor

come-nc commented Mar 14, 2024

@marcelklehr cypress fails consitently, not sure if related

@nickvergessen nickvergessen merged commit 32d1d59 into master Mar 18, 2024
41 of 43 checks passed
@nickvergessen nickvergessen deleted the fix/mail-queue-handler-invalid-argument-exception branch March 18, 2024 10:08
Copy link

backportbot bot commented Mar 18, 2024

The backport to stable28 failed. Please do this backport manually.

# 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/stable28

Error: 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
Projects
None yet
4 participants