Skip disabled users and do not break the cronjob on the first unsent email #842
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
Member
VicDeo
commented
Mar 9, 2020
•
VicDeo
commented
- we don't need to fix DI since Allow background jobs to be service names for DI core#21281
- Do not try to send notification if the user is disabled
- Keep on sending emails after the exception
Codecov Report
@@ Coverage Diff @@
## master #842 +/- ##
============================================
- Coverage 84.38% 84.37% -0.01%
+ Complexity 507 504 -3
============================================
Files 47 47
Lines 1896 1895 -1
============================================
- Hits 1600 1599 -1
Misses 296 296
Continue to review full report at Codecov.
|
VicDeo
changed the title
micbar
reviewed
Mar 10, 2020
| @@ -144,10 +142,14 @@ protected function runStep($limit, $sendTime) { | |||
| $this->mqHandler->sendEmailToUser($uid, $user['email'], $language, $timezone, $sendTime); | |||
| $sentMailForUsers[] = $uid; | |||
| } catch (\Exception $e) { | |||
| // Run cleanup before we die | |||
| $this->mqHandler->deleteSentItems($sentMailForUsers, $sendTime); | |||
| // Throw the exception again - which gets logged by core and the job is handled appropriately | |||
There was a problem hiding this comment.
Why is the cleanup not needed anymore?
There was a problem hiding this comment.
we don't rethrow exception any more which means that we always reach the line 155 now
https://github.com/owncloud/activity/pull/842/files#diff-35fc1857b1cf16ed158a97c77089f80cL155
|
One question. Rest looking fine |
|
Coverage is miscalculating @VicDeo Can I merge now and override? |
Closed
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.