From a86c5e6f3ecd424a87e183b6f04ecfe8dbb38a57 Mon Sep 17 00:00:00 2001
From: Mohammad Torkashvand <mohammad.torkashvand@geant.org>
Date: Mon, 7 Oct 2024 14:02:39 +0200
Subject: [PATCH] remove task routing
---
gso/__init__.py | 8 +++++++-
gso/worker.py | 5 ++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/gso/__init__.py b/gso/__init__.py
index 2a4c56d7..27e95e86 100644
--- a/gso/__init__.py
+++ b/gso/__init__.py
@@ -23,6 +23,12 @@ from gso.settings import load_oss_params
SCALAR_OVERRIDES.update(GSO_SCALAR_OVERRIDES)
+def gso_initialise_celery(celery: Celery) -> None:
+ """Initialise the :term:`Celery` app."""
+ initialise_celery(celery)
+ celery.conf.task_routes = {}
+
+
def init_gso_app() -> OrchestratorCore:
"""Initialise the :term:`GSO` app."""
app = OrchestratorCore(base_settings=app_settings)
@@ -43,7 +49,7 @@ def init_gso_app() -> OrchestratorCore:
celery.conf.update(
result_expires=config.CELERY.result_expires,
)
- initialise_celery(celery)
+ gso_initialise_celery(celery)
return app
diff --git a/gso/worker.py b/gso/worker.py
index 09c17a3e..29f46280 100644
--- a/gso/worker.py
+++ b/gso/worker.py
@@ -10,14 +10,13 @@ from orchestrator import app_settings
from orchestrator.db import init_database
from orchestrator.domain import SUBSCRIPTION_MODEL_REGISTRY
from orchestrator.log_config import LOGGER_OVERRIDES, logger_config
-from orchestrator.services.tasks import initialise_celery
from orchestrator.types import BroadcastFunc
from orchestrator.websocket import broadcast_process_update_to_websocket, init_websocket_manager
from orchestrator.websocket.websocket_manager import WebSocketManager
from orchestrator.workflows import ALL_WORKFLOWS
from structlog import get_logger
-from gso import init_worker_app
+from gso import gso_initialise_celery, init_worker_app
from gso.settings import load_oss_params
logger = get_logger(__name__)
@@ -104,7 +103,7 @@ celery.conf.update(
redbeat_redis_url=settings.CELERY.broker_url,
)
-initialise_celery(celery)
+gso_initialise_celery(celery)
@worker_shutting_down.connect # type: ignore[misc]
--
GitLab