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

Fix retry logic for failed order downloads

Browse Source
This commit is contained in:
Raphael Michel
2017-03-29 14:34:44 +02:00
parent c1a76c4c18
commit 887152a0e2
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pretix/presale/views/order.py
View File

@@ -550,11 +550,13 @@ class OrderDownload(EventViewMixin, OrderDetailMixin, View):
extension='', type='', file=None) extension='', type='', file=None)
generate_order.apply_async(args=(self.order.id, self.output.identifier)) generate_order.apply_async(args=(self.order.id, self.output.identifier))
if not ct.file:
if now() - ct.created > timedelta(minutes=5):
generate_order.apply_async(args=(self.order.id, self.output.identifier))
if 'ajax' in self.request.GET: if 'ajax' in self.request.GET:
return HttpResponse('1' if ct and ct.file else '0') return HttpResponse('1' if ct and ct.file else '0')
elif not ct.file: elif not ct.file:
if now() - ct.created > timedelta(minutes=110):
generate_order.apply_async(args=(self.order.id, self.output.identifier))
return render(self.request, "pretixbase/cachedfiles/pending.html", {}) return render(self.request, "pretixbase/cachedfiles/pending.html", {})
else: else:
resp = FileResponse(ct.file.file, content_type=ct.type) resp = FileResponse(ct.file.file, content_type=ct.type)
@@ -577,11 +579,13 @@ class OrderDownload(EventViewMixin, OrderDetailMixin, View):
extension='', type='', file=None) extension='', type='', file=None)
generate.apply_async(args=(self.order_position.id, self.output.identifier)) generate.apply_async(args=(self.order_position.id, self.output.identifier))
if not ct.file:
if now() - ct.created > timedelta(minutes=5):
generate.apply_async(args=(self.order_position.id, self.output.identifier))
if 'ajax' in self.request.GET: if 'ajax' in self.request.GET:
return HttpResponse('1' if ct and ct.file else '0') return HttpResponse('1' if ct and ct.file else '0')
elif not ct.file: elif not ct.file:
if now() - ct.created > timedelta(minutes=110):
generate.apply_async(args=(self.order_position.id, self.output.identifier))
return render(self.request, "pretixbase/cachedfiles/pending.html", {}) return render(self.request, "pretixbase/cachedfiles/pending.html", {})
else: else:
resp = FileResponse(ct.file.file, content_type=ct.type) resp = FileResponse(ct.file.file, content_type=ct.type)