Add incident for SMTP errors #5704
Closed
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
norkans7
commented
Nov 27, 2024
|
|
||
| def send(self, recipients: list, subject: str, template: str, context: dict): | ||
| """ | ||
| Sends a multi-part email rendered from templates for the text and html parts. `template` should be the name of | ||
| the template, without .html or .txt (e.g. 'channels/email/power_charging'). | ||
| """ | ||
| from temba.notifications.incidents.builtin import OrgSMTPFailedIncidentType |
norkans7
commented
Nov 27, 2024
temba/utils/email/send.py
Outdated
| send_email(recipients, subject, text, html, self.from_email, self.connection) | ||
| try: | ||
| send_email(recipients, subject, text, html, self.from_email, self.connection) | ||
| except smtplib.SMTPException: |
There was a problem hiding this comment.
extended to catch all SMTPException not just SMTPAuthenticationError
norkans7
commented
Nov 27, 2024
Comment on lines
+71
to
+79
| OrgSMTPFailedIncidentType.get_or_create(self.org) | ||
| return | ||
| except Exception as e: | ||
| raise e | ||
| OrgSMTPFailedIncidentType.find_and_end(self.org) |
There was a problem hiding this comment.
Added this here to avoid the repetition everywhere we send emails
norkans7
commented
Nov 27, 2024
| self.branding = branding | ||
| self.connection = connection # can be none to use default Django email connection | ||
| self.from_email = from_email if from_email else getattr(settings, "DEFAULT_FROM_EMAIL", "[email protected]") | ||
| self.org = org |
There was a problem hiding this comment.
Added org so we can make the incident for the correct org, however we do not have org all them time such as the case for user forget password view, in that case we cannot create an incident.
norkans7
force-pushed
the
smtp-failed
branch
from
b014455
to
7015fc0
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #5704 +/- ##
==========================================
Coverage 100.00% 100.00%
==========================================
Files 572 573 +1
Lines 25925 26383 +458
==========================================
+ Hits 25925 26383 +458 ☔ View full report in Codecov by Sentry. |
norkans7
force-pushed
the
smtp-failed
branch
from
7015fc0
to
44b21fb
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.