ee

Author: marcoacierno

backend/notifications/tasks.py

@@ -1,4 +1,6 @@
+from celery.exceptions import MaxRetriesExceededError
 import logging
+import smtplib
 from uuid import uuid4
 from notifications.models import SentEmail
 from django.db import transaction
@@ -11,7 +13,6 @@
 
 @app.task(
     bind=True,
-    autoretry_for=(Exception,),
     retry_backoff=5,
     max_retries=5,
 )
@@ -34,18 +35,28 @@ def send_pending_email(self, sent_email_id: int):
     if not sent_email:
         return
 
-    email_backend_connection = get_connection()
+    try:
+        email_backend_connection = get_connection()
 
-    if self.request.retries > self.max_retries:
+        message_id = send_email(sent_email, email_backend_connection)
+        sent_email.mark_as_sent(message_id)
+    except smtplib.SMTPException as e:
+        try:
+            raise self.retry(e)
+        except MaxRetriesExceededError:
+            sent_email.mark_as_failed()
+            logger.error(
+                "Failed to send email sent_email_id=%s",
+                sent_email.id,
+            )
+            return
+    except Exception as e:
         sent_email.mark_as_failed()
         logger.error(
             "Failed to send email sent_email_id=%s",
             sent_email.id,
         )
-        return
-
-    message_id = send_email(sent_email, email_backend_connection)
-    sent_email.mark_as_sent(message_id)
+        raise e
 
     logger.info(
         "Email sent_email_id=%s sent with message_id=%s",

backend/notifications/tests/test_tasks.py

@@ -1,4 +1,4 @@
-from unittest import mock
+import smtplib
 from unittest.mock import patch
 import time_machine
 from django.core import mail
@@ -83,19 +83,16 @@ def test_send_pending_email_handles_failures(mocker):
     def _side_effect(*args, **kwargs):
         if _side_effect.counter == 0:
             _side_effect.counter = 1
-            raise ValueError("test")
+            raise smtplib.SMTPException("test")
 
         return original_method(pending_email_1, *args, **kwargs)
 
     _side_effect.counter = 0
 
-    mocker.patch("notifications.tasks.SentEmail.mark_as_sent", side_effect=_side_effect)
+    mocker.patch("notifications.tasks.send_email", side_effect=_side_effect)
 
-    with time_machine.travel("2021-01-01 12:00Z", tick=False), mock.patch(
-        "celery.app.task.Task.request"
-    ) as mock_task_request:
-        mock_task_request.retries = 10
-        send_pending_email(pending_email_1.id)
+    with time_machine.travel("2021-01-01 12:00Z", tick=False):
+        send_pending_email.apply(kwargs={"sent_email_id": pending_email_1.id})
 
     pending_email_1.refresh_from_db()