Skip to content

Commit 9c63ea0

Browse files
risssonauthentik-automation[bot]
authored andcommitted
Cherry-pick #17769 to version-2025.8 (with conflicts)
This cherry-pick has conflicts that need manual resolution. Original PR: #17769 Original commit: 56d399a
1 parent 0845e23 commit 9c63ea0

File tree

3 files changed

+28
-7
lines changed

3 files changed

+28
-7
lines changed

authentik/root/settings.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,12 @@
418418
},
419419
),
420420
("dramatiq.results.middleware.Results", {"store_results": True}),
421+
<<<<<<< HEAD
421422
("django_dramatiq_postgres.middleware.CurrentTask", {}),
423+
=======
424+
("authentik.tasks.middleware.StartupSignalsMiddleware", {}),
425+
("authentik.tasks.middleware.CurrentTask", {}),
426+
>>>>>>> 56d399a25 (tasks: delay startup signals (#17769))
422427
("authentik.tasks.middleware.TenantMiddleware", {}),
423428
("authentik.tasks.middleware.RelObjMiddleware", {}),
424429
("authentik.tasks.middleware.MessagesMiddleware", {}),

authentik/tasks/middleware.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,36 @@
2222
from authentik.events.models import Event, EventAction
2323
from authentik.lib.sentry import should_ignore_exception
2424
from authentik.lib.utils.reflection import class_to_path
25+
<<<<<<< HEAD
2526
from authentik.tasks.models import Task, TaskStatus, WorkerStatus
27+
=======
28+
from authentik.root.signals import post_startup, pre_startup, startup
29+
from authentik.tasks.models import Task, TaskLog, TaskStatus, WorkerStatus
30+
>>>>>>> 56d399a25 (tasks: delay startup signals (#17769))
2631
from authentik.tenants.models import Tenant
2732
from authentik.tenants.utils import get_current_tenant
2833

2934
LOGGER = get_logger()
3035
HEALTHCHECK_LOGGER = get_logger("authentik.worker").bind()
36+
<<<<<<< HEAD
3137
DB_ERRORS = (OperationalError, Error, RedisError)
38+
=======
39+
DB_ERRORS = (OperationalError, Error)
40+
41+
42+
class StartupSignalsMiddleware(Middleware):
43+
def after_process_boot(self, broker: Broker):
44+
_startup_sender = type("WorkerStartup", (object,), {})
45+
pre_startup.send(sender=_startup_sender)
46+
startup.send(sender=_startup_sender)
47+
post_startup.send(sender=_startup_sender)
48+
49+
50+
class CurrentTask(BaseCurrentTask):
51+
@classmethod
52+
def get_task(cls) -> Task:
53+
return cast(Task, super().get_task())
54+
>>>>>>> 56d399a25 (tasks: delay startup signals (#17769))
3255

3356

3457
class TenantMiddleware(Middleware):

authentik/tasks/setup.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,3 @@
55
import django # noqa: E402
66

77
django.setup()
8-
9-
from authentik.root.signals import post_startup, pre_startup, startup # noqa: E402
10-
11-
_startup_sender = type("WorkerStartup", (object,), {})
12-
pre_startup.send(sender=_startup_sender)
13-
startup.send(sender=_startup_sender)
14-
post_startup.send(sender=_startup_sender)

0 commit comments

Comments
 (0)