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

Mail: Fix stuck state when tickets are not available (Z#23225229) (#5917)

Browse Source
This commit is contained in:
Raphael Michel
2026-02-22 16:58:41 +01:00
committed by GitHub
parent 9962d8a3be
commit 802c03f8f3
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -389,7 +389,7 @@ def mail_send_task(self, **kwargs) -> bool:
# mail_send_task(self, *, outgoing_mail) # mail_send_task(self, *, outgoing_mail)
with scopes_disabled(): with scopes_disabled():
mail_send(**kwargs) mail_send(**kwargs)
return return False
else: else:
raise ValueError("Unknown arguments") raise ValueError("Unknown arguments")
@@ -443,15 +443,24 @@ def mail_send_task(self, **kwargs) -> bool:
content = ct.file.read() content = ct.file.read()
args.append((name, content, ct.type)) args.append((name, content, ct.type))
attach_size += len(content) attach_size += len(content)
except Exception: except Exception as e:
# This sometimes fails e.g. with FileNotFoundError. We haven't been able to figure out # 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. # why (probably some race condition with ticket cache invalidation?), so retry later.
try: try:
self.retry(max_retries=5, countdown=60) logger.exception(f'Could not attach tickets to email {outgoing_mail.guid}, will retry')
retry_after = 60
outgoing_mail.error = "Tickets not ready"
outgoing_mail.error_detail = str(e)
outgoing_mail.sent = now()
outgoing_mail.status = OutgoingMail.STATUS_AWAITING_RETRY
outgoing_mail.retry_after = now() + timedelta(seconds=retry_after)
outgoing_mail.save(update_fields=["status", "error", "error_detail", "sent", "retry_after",
"actual_attachments"])
self.retry(max_retries=5, countdown=retry_after)
except MaxRetriesExceededError: except MaxRetriesExceededError:
# Well then, something is really wrong, let's send it without attachment before we # Well then, something is really wrong, let's send it without attachment before we
# don't send at all # don't send at all
logger.exception(f'Could not attach tickets to email {outgoing_mail.guid}') logger.exception(f'Too many retries attaching tickets to email {outgoing_mail.guid}, skip attachment')
pass pass
if attach_size * 1.37 < settings.FILE_UPLOAD_MAX_SIZE_EMAIL_ATTACHMENT - 1024 * 1024: if attach_size * 1.37 < settings.FILE_UPLOAD_MAX_SIZE_EMAIL_ATTACHMENT - 1024 * 1024: