Merge branch 'dev' into 'main'

chore: Handle store_reply_record error

See merge request locker/maily!20

src/maily/aws/ses.py

@@ -3,7 +3,7 @@
 from maily.aws import AWS
 from maily.logger import logger
 from email.mime.text import MIMEText
-from botocore.exceptions import ClientError
+from botocore.exceptions import ClientError, ConnectionClosedError
 from email.mime.multipart import MIMEMultipart
 from maily.locker_api import store_reply_record
 from email.mime.application import MIMEApplication
@@ -93,7 +93,9 @@ def ses_send_raw_email(self, from_address, to_address, subject, message_body, at
             #     ConfigurationSetName=AWS_SES_CONFIG_SET,
             # )
 
-            store_reply_record(mail, ses_response)
+            stored = store_reply_record(mail, ses_response)
+            if not stored:
+                logger.error(f"[!] Store reply record error. Please check the Locker Reply API")
         except ClientError as e:
             # Handel SES HTTP error: https://docs.aws.amazon.com/ses/latest/APIReference-V2/CommonErrors.html
             error_code = e.response.get("Error", {}).get("Code")
@@ -103,7 +105,7 @@ def ses_send_raw_email(self, from_address, to_address, subject, message_body, at
             # logger.error(
             #     f'from_address: {from_address}\nto_address: {to_address}\ndata: {msg_with_attachments.as_string()}')
             return False
-        except botocore.exceptions.ConnectionClosedError:
+        except ConnectionClosedError:
             return None
         return True
 

src/maily/locker_api.py

@@ -54,8 +54,15 @@ def store_reply_record(mail, ses_response):
     payload = {"lookup": lookup, "encrypted_metadata": encrypted_metadata}
     # Request to API to store payload
     url = f'{ROOT_API}reply'
-    r = requests.post(url=url, json=payload, headers=HEADERS)
-
+    # Handle store reply record failed
+    retry = 0
+    while retry <= 5:
+        try:
+            requests.post(url=url, json=payload, headers=HEADERS)
+            return True
+        except (requests.exceptions.ConnectionError, requests.exceptions.ConnectTimeout, KeyError):
+            retry += 1
+    return False
 
 def reply_allowed(from_address, to_address):
     """