From cd63399d5131324fd191b88ba868aec14180d03a Mon Sep 17 00:00:00 2001
From: Mira Weller <weller@rami.io>
Date: Tue, 7 Jul 2026 11:55:48 +0200
Subject: [PATCH] Log RequestId in Celery tasks

---
 src/pretix/celery_app.py | 4 ++++
 src/pretix/settings.py   | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pretix/celery_app.py b/src/pretix/celery_app.py
index 4863dc37e..d7d07ede3 100644
--- a/src/pretix/celery_app.py
+++ b/src/pretix/celery_app.py
@@ -28,6 +28,10 @@ from django.dispatch import receiver
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.settings")
 logger = logging.getLogger(__name__)
 
+from pretix.settings import LOGGING
+
+LOGGING['formatters']['default']['format'] = '[%(asctime)s: %(levelname)s/%(processName)s] RequestId=%(request_id)s %(name)s %(module)s %(message)s'
+
 from django.conf import settings
 
 app = Celery('pretix')
diff --git a/src/pretix/settings.py b/src/pretix/settings.py
index 2b49ef69e..94cb378c1 100644
--- a/src/pretix/settings.py
+++ b/src/pretix/settings.py
@@ -619,8 +619,6 @@ LOGGING = {
         'default': {
             'format': (
                 '%(levelname)s %(asctime)s RequestId=%(request_id)s %(name)s %(module)s %(message)s'
-                if REQUEST_ID_HEADER
-                else '%(levelname)s %(asctime)s %(name)s %(module)s %(message)s'
             )
         },
     },
@@ -707,6 +705,7 @@ LOGGING = {
         },
     },
 }
+CELERY_WORKER_HIJACK_ROOT_LOGGER = False
 
 SENTRY_ENABLED = False
 if config.has_option('sentry', 'dsn') and not any(c in sys.argv for c in ('shell', 'shell_scoped', 'shell_plus')):