From 9e019ae98ae4599d57f3f739083a98ac8b24cb6b Mon Sep 17 00:00:00 2001
From: Son <nguyenkims@users.noreply.github.com>
Date: Wed, 29 Dec 2021 15:17:57 +0100
Subject: [PATCH] retry sending mail if TimeoutError

---
 email_handler.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/email_handler.py b/email_handler.py
index f9a23823..c702fdb1 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -822,10 +822,9 @@ def forward_email_to_mailbox(
             envelope.rcpt_options,
             is_forward=True,
         )
-    except (SMTPServerDisconnected, SMTPRecipientsRefused):
-        # that means the mailbox is maybe invalid
+    except (SMTPServerDisconnected, SMTPRecipientsRefused, TimeoutError):
         LOG.w(
-            "SMTPServerDisconnected or SMTPRecipientsRefused during forward phase %s -> %s -> %s",
+            "Postfix error during forward phase %s -> %s -> %s",
             contact,
             alias,
             mailbox,
@@ -834,7 +833,7 @@ def forward_email_to_mailbox(
         if should_ignore_bounce(envelope.mail_from):
             return True, status.E207
         else:
-            # can be Postfix intermittent "Temporary lookup failure" error
+            # so Postfix can retry
             return False, status.E407
     else:
         Session.commit()