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

Mail: Retry if pulling attachments failed

Browse Source
This commit is contained in:
Raphael Michel
2021-04-21 11:33:15 +02:00
parent 1314cdc7b7
commit caa61a463e
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -355,9 +355,20 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
args = [] args = []
attach_size = 0 attach_size = 0
for name, ct in get_tickets_for_order(order, base_position=position): for name, ct in get_tickets_for_order(order, base_position=position):
content = ct.file.read() try:
args.append((name, content, ct.type)) content = ct.file.read()
attach_size += len(content) args.append((name, content, ct.type))
attach_size += len(content)
except:
# This sometimes fails e.g. with FileNotFoundError. We haven't been able to figure out
# why (probably some race condition with ticket cache invalidation?), so retry later.
try:
self.retry(max_retries=5, countdown=60)
except MaxRetriesExceededError:
# Well then, something is really wrong, let's send it without attachment before we
# don't sent at all
logger.exception('Could not attach invoice to email')
pass
if attach_size < 4 * 1024 * 1024: if attach_size < 4 * 1024 * 1024:
# Do not attach more than 4MB, it will bounce way to often. # Do not attach more than 4MB, it will bounce way to often.