CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix off-by-one error in retry intervals

Browse Source
This commit is contained in:
Raphael Michel
2022-09-29 11:39:24 +02:00
parent 6bba37288e
commit 1839dcdb74
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/base/services/mail.py
View File

@@ -506,7 +506,7 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
else: else:
# Most likely some other kind of temporary failure, retry again (but pretty soon) # Most likely some other kind of temporary failure, retry again (but pretty soon)
max_retries = 5 max_retries = 5
retry_after = [10, 30, 60, 300, 900][self.request.retries] retry_after = [10, 30, 60, 300, 900, 900][self.request.retries]
try: try:
self.retry(max_retries=max_retries, countdown=retry_after) self.retry(max_retries=max_retries, countdown=retry_after)
@@ -567,7 +567,7 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
except Exception as e: except Exception as e:
if isinstance(e, (smtplib.SMTPServerDisconnected, smtplib.SMTPConnectError, ssl.SSLError, OSError)): if isinstance(e, (smtplib.SMTPServerDisconnected, smtplib.SMTPConnectError, ssl.SSLError, OSError)):
try: try:
self.retry(max_retries=5, countdown=[10, 30, 60, 300, 900][self.request.retries]) self.retry(max_retries=5, countdown=[10, 30, 60, 300, 900, 900][self.request.retries])
except MaxRetriesExceededError: except MaxRetriesExceededError:
if log_target: if log_target:
log_target.log_action( log_target.log_action(