Merge ec07671 into bcd2f81

pinax · Oct 20, 2017 · 1bd02ba · 1bd02ba
2 parents bcd2f81 + ec07671
commit 1bd02ba
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/mailer/engine.py b/mailer/engine.py
@@ -163,10 +163,7 @@ def send_all():
                     logging.warning("message discarded due to failure in converting from DB. Added on '%s' with priority '%s'" % (message.when_added, message.priority))  # noqa
                 message.delete()
 
-            except (socket_error, smtplib.SMTPSenderRefused,
-                    smtplib.SMTPRecipientsRefused,
-                    smtplib.SMTPDataError,
-                    smtplib.SMTPAuthenticationError) as err:
+            except Exception as err:
                 message.defer()
                 logging.info("message deferred due to failure: %s" % err)
                 MessageLog.objects.log(message, RESULT_FAILURE, log_message=str(err))