Mirror/app-MAIL-temp
1
0
Fork 0
mirror of https://github.com/simple-login/app.git synced 2024-11-18 01:40:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix: Retry incrementally in the future and abort after certain retries

Browse source
This commit is contained in:
Adrià Casajús 2023-04-19 12:35:46 +02:00
parent 62fecf1190
commit e5fbe66870
No known key found for this signature in database
GPG key ID: F0033226A5AFC9B9
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/mail_sender.py
View file

@ -32,6 +32,8 @@ class SendRequest:
rcpt_options: Dict = {}
is_forward: bool = False
ignore_smtp_errors: bool = False
retried: int = 0
next_retry: Optional[int] = None
def to_bytes(self) -> bytes:
if not config.SAVE_UNSENT_DIR:
@ -45,6 +47,8 @@ class SendRequest:
"mail_options": self.mail_options,
"rcpt_options": self.rcpt_options,
"is_forward": self.is_forward,
"retried": self.retried,
"next_retry": self.next_retry,
}
return json.dumps(data).encode("utf-8")
@ -65,6 +69,8 @@ class SendRequest:
mail_options=decoded_data["mail_options"],
rcpt_options=decoded_data["rcpt_options"],
is_forward=decoded_data["is_forward"],
retried=decoded_data.get("retried", 0),
next_retry=decoded_data.get("next_retry", int(time.time())),
)
@ -222,6 +228,9 @@ def load_unsent_mails_from_fs_and_resend():
except Exception as e:
LOG.e(f"Cannot load {filename}. Error {e}")
continue
if send_request.next_retry is None or send_request.next_retry > time.time():
LOG.e(f"Will retry in the future {filename}")
continue
try:
send_request.ignore_smtp_errors = True
if mail_sender.send(send_request, 2):
@ -230,6 +239,15 @@ def load_unsent_mails_from_fs_and_resend():
"DeliverUnsentEmail", {"delivered": "true"}
)
else:
if send_request.retried > 10:
os.unlink(full_file_path)
else:
send_request.retried += 1
send_request.next_retry = int(time.time()) + (
50 * send_request.retried
)
with open(full_file_path, "wb") as fd:
fd.write(send_request.to_bytes())
newrelic.agent.record_custom_event(
"DeliverUnsentEmail", {"delivered": "false"}
)