From b9e2a79933aa9a73cdfeacc58d47b38d22fe8f60 Mon Sep 17 00:00:00 2001
From: Son <nguyenkims@users.noreply.github.com>
Date: Tue, 28 Dec 2021 16:42:01 +0100
Subject: [PATCH] enable email sending retry in cron job

---
 app/email_utils.py | 8 +++++---
 cron.py            | 8 ++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/email_utils.py b/app/email_utils.py
index 4d713475..eeae62fd 100644
--- a/app/email_utils.py
+++ b/app/email_utils.py
@@ -249,6 +249,7 @@ def send_email(
     html=None,
     unsubscribe_link=None,
     unsubscribe_via_email=False,
+    retries=0,  # by default no retry if sending fails
 ):
     to_email = sanitize_email(to_email)
     if NOT_SEND_EMAIL:
@@ -306,7 +307,7 @@ def send_email(
         TRANSACTIONAL_BOUNCE_EMAIL.format(transaction.id),
         to_email,
         msg,
-        retries=0,  # no retry
+        retries=retries,
     )
 
 
@@ -320,6 +321,7 @@ def send_email_with_rate_control(
     max_nb_alert=MAX_ALERT_24H,
     nb_day=1,
     ignore_smtp_error=False,
+    retries=0,
 ) -> bool:
     """Same as send_email with rate control over alert_type.
     Make sure no more than `max_nb_alert` emails are sent over the period of `nb_day` days
@@ -349,11 +351,11 @@ def send_email_with_rate_control(
 
     if ignore_smtp_error:
         try:
-            send_email(to_email, subject, plaintext, html)
+            send_email(to_email, subject, plaintext, html, retries=retries)
         except SMTPException:
             LOG.w("Cannot send email to %s, subject %s", to_email, subject)
     else:
-        send_email(to_email, subject, plaintext, html)
+        send_email(to_email, subject, plaintext, html, retries=retries)
 
     return True
 
diff --git a/cron.py b/cron.py
index a935be51..6f17f28b 100644
--- a/cron.py
+++ b/cron.py
@@ -150,6 +150,7 @@ def notify_premium_end():
                     user=user,
                     next_bill_date=sub.next_bill_date.strftime("%Y-%m-%d"),
                 ),
+                retries=3,
             )
 
 
@@ -206,6 +207,7 @@ def notify_manual_sub_end():
                     user=user,
                     manual_sub=manual_sub,
                 ),
+                retries=3,
             )
 
     extend_subscription_url = URL + "/dashboard/coinbase_checkout"
@@ -242,6 +244,7 @@ def notify_manual_sub_end():
                     coinbase_subscription=coinbase_subscription,
                     extend_subscription_url=extend_subscription_url,
                 ),
+                retries=3,
             )
 
 
@@ -535,6 +538,7 @@ nb_referred_user_upgrade: {stats_today.nb_referred_user_paid} - {increase_percen
         ADMIN_EMAIL,
         subject=f"SimpleLogin Stats for {today}, {nb_user_increase} users, {nb_alias_increase} aliases, {nb_forward_increase} forwards",
         plaintext=report,
+        retries=3,
     )
 
 
@@ -620,6 +624,7 @@ def sanity_check():
                             "transactional/disable-mailbox-warning.html",
                             mailbox=mailbox,
                         ),
+                        retries=3,
                     )
 
             # alert if too much fail and nb_email_log > 100
@@ -634,6 +639,7 @@ def sanity_check():
                             "transactional/disable-mailbox.txt.jinja2", mailbox=mailbox
                         ),
                         render("transactional/disable-mailbox.html", mailbox=mailbox),
+                        retries=3,
                     )
 
             LOG.w(
@@ -732,6 +738,7 @@ def check_custom_domain():
                     ),
                     max_nb_alert=1,
                     nb_day=30,
+                    retries=3,
                 )
                 # reset checks
                 custom_domain.nb_failed_checks = 0
@@ -914,6 +921,7 @@ def notify_hibp():
                 user=user,
                 breached_aliases=breached_aliases,
             ),
+            retries=3,
         )
 
         # add the breached aliases to HibpNotifiedAlias to avoid sending another email