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

Fix logic bug in attachment size check

Browse Source
This commit is contained in:
Raphael Michel
2019-04-15 12:58:36 +02:00
parent 874b38db17
commit f2cd9a2002
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,14 +219,23 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
args.append((name, content, ct.type)) args.append((name, content, ct.type))
attach_size += len(content) attach_size += len(content)
if attach_tickets < 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.
for a in args: for a in args:
try: try:
email.attach(*a) email.attach(*a)
except: except:
pass pass
else:
order.log_action(
'pretix.event.order.email.error',
data={
'subject': 'Attachments skipped',
'message': 'Attachment have not been send because {} bytes are likely too large to arrive.'.format(attach_size),
'recipient': '',
'invoices': [],
}
)
email = email_filter.send_chained(event, 'message', message=email, order=order) email = email_filter.send_chained(event, 'message', message=email, order=order)