Always process tasks through celery (#245)

src/pretix/presale/style.py

@@ -9,10 +9,12 @@ from django.core.files.base import ContentFile
 from django.core.files.storage import default_storage
 
 from pretix.base.models import Event
+from pretix.celery import app
 
 logger = logging.getLogger('pretix.presale.style')
 
 
+@app.task
 def regenerate_css(event_id: int):
     event = Event.objects.select_related('organizer').get(pk=event_id)
     sassdir = os.path.join(settings.STATIC_ROOT, 'pretixpresale/scss')
@@ -36,12 +38,3 @@ def regenerate_css(event_id: int):
         newname = default_storage.save(fname, ContentFile(css))
         event.settings.set('presale_css_file', newname)
         event.settings.set('presale_css_checksum', checksum)
-
-
-if settings.HAS_CELERY:
-    from pretix.celery import app
-
-    regenerate_css_task = app.task(regenerate_css)
-
-    def regenerate_css(*args, **kwargs):
-        regenerate_css_task.apply_async(args=args, kwargs=kwargs)

src/pretix/presale/views/order.py

@@ -500,7 +500,7 @@ class OrderDownload(EventViewMixin, OrderDetailMixin, View):
             cf.save()
             ct.cachedfile = cf
         ct.save()
-        generate(self.order.id, self.output.identifier)
+        generate.apply_async(args=(self.order.id, self.output.identifier))
         return redirect(reverse('cachedfile.download', kwargs={'id': ct.cachedfile.id}))