Commit fc9e1ed2 authored by Cecylia Bocovich's avatar Cecylia Bocovich
Browse files

Treat all email sending exceptions the same

In the previous commit, we forgot to remove requests that trigger
exceptions other than SMTPClientError.
parent 80371ae6
...@@ -230,14 +230,9 @@ class Sendmail(object): ...@@ -230,14 +230,9 @@ class Sendmail(object):
id=id, service="email", date=date id=id, service="email", date=date
) )
except smtp.SMTPClientError as e: except Exception as e:
yield self.conn.remove_request( yield self.conn.remove_request(
id=id, service="email", date=date id=id, service="email", date=date
) )
log.error(strings.redact_emails( log.error(strings.redact_emails(
"Error sending email to {}:{}.".format(id, e))) "Error sending email to {}:{}.".format(id, e)))
except Exception as e:
log.error(
strings.redact_emails("Error sending email:{}.".format(e))
)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment