Add prioritization to webhook/notifications queue (#5513)

* Add prioritization to webhook/notifications queue

* Add missing code

* Missing license header

* Fix argument

* Use redis pipeline

* Update license header

src/pretix/base/models/base.py

@@ -31,6 +31,7 @@ from django.urls import reverse
 from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
 
+from pretix.helpers.celery import get_task_priority
 from pretix.helpers.json import CustomJSONEncoder
 
 
@@ -131,9 +132,15 @@ class LoggingMixin:
             logentry.save()
 
             if logentry.notification_type:
-                notify.apply_async(args=(logentry.pk,))
+                notify.apply_async(
+                    args=(logentry.pk,),
+                    priority=get_task_priority("notifications", logentry.organizer_id),
+                )
             if logentry.webhook_type:
-                notify_webhooks.apply_async(args=(logentry.pk,))
+                notify_webhooks.apply_async(
+                    args=(logentry.pk,),
+                    priority=get_task_priority("notifications", logentry.organizer_id),
+                )
 
         return logentry
 

src/pretix/base/models/log.py

@@ -35,11 +35,14 @@
 import json
 import logging
 
+from django.conf import settings
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.db import connections, models
 from django.utils.functional import cached_property
 
+from pretix.helpers.celery import get_task_priority
+
 
 class VisibleOnlyManager(models.Manager):
     def get_queryset(self):
@@ -186,7 +189,19 @@ class LogEntry(models.Model):
 
         to_notify = [o.id for o in objects if o.notification_type]
         if to_notify:
-            notify.apply_async(args=(to_notify,))
+            organizer_ids = set(o.organizer_id for o in objects if o.notification_type)
+            notify.apply_async(
+                args=(to_notify,),
+                priority=settings.PRIORITY_CELERY_HIGHEST_FUNC(
+                    get_task_priority("notifications", oid) for oid in organizer_ids
+                ),
+            )
         to_wh = [o.id for o in objects if o.webhook_type]
         if to_wh:
-            notify_webhooks.apply_async(args=(to_wh,))
+            organizer_ids = set(o.organizer_id for o in objects if o.webhook_type)
+            notify_webhooks.apply_async(
+                args=(to_wh,),
+                priority=settings.PRIORITY_CELERY_HIGHEST_FUNC(
+                    get_task_priority("notifications", oid) for oid in organizer_ids
+                ),
+            )

src/pretix/base/services/notifications.py

@@ -32,6 +32,7 @@ from pretix.base.services.mail import mail_send_task
 from pretix.base.services.tasks import ProfiledTask, TransactionAwareTask
 from pretix.base.signals import notification
 from pretix.celery_app import app
+from pretix.helpers.celery import get_task_priority
 from pretix.helpers.urls import build_absolute_uri
 
 
@@ -88,12 +89,18 @@ def notify(logentry_ids: list):
         for um, enabled in notify_specific.items():
             user, method = um
             if enabled:
-                send_notification.apply_async(args=(logentry.id, notification_type.action_type, user.pk, method))
+                send_notification.apply_async(
+                    args=(logentry.id, notification_type.action_type, user.pk, method),
+                    priority=get_task_priority("notifications", logentry.organizer_id),
+                )
 
         for um, enabled in notify_global.items():
             user, method = um
             if enabled and um not in notify_specific:
-                send_notification.apply_async(args=(logentry.id, notification_type.action_type, user.pk, method))
+                send_notification.apply_async(
+                    args=(logentry.id, notification_type.action_type, user.pk, method),
+                    priority=get_task_priority("notifications", logentry.organizer_id),
+                )
 
         notification.send(logentry.event, logentry_id=logentry.id, notification_type=notification_type.action_type)