Skip to content
Snippets Groups Projects
Commit a86c5e6f authored by Mohammad Torkashvand's avatar Mohammad Torkashvand
Browse files

remove task routing

parent 410b8de5
No related branches found
No related tags found
1 merge request!280add celery as EXECUTOR
Pipeline #89510 passed
...@@ -23,6 +23,12 @@ from gso.settings import load_oss_params ...@@ -23,6 +23,12 @@ from gso.settings import load_oss_params
SCALAR_OVERRIDES.update(GSO_SCALAR_OVERRIDES) 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: def init_gso_app() -> OrchestratorCore:
"""Initialise the :term:`GSO` app.""" """Initialise the :term:`GSO` app."""
app = OrchestratorCore(base_settings=app_settings) app = OrchestratorCore(base_settings=app_settings)
...@@ -43,7 +49,7 @@ def init_gso_app() -> OrchestratorCore: ...@@ -43,7 +49,7 @@ def init_gso_app() -> OrchestratorCore:
celery.conf.update( celery.conf.update(
result_expires=config.CELERY.result_expires, result_expires=config.CELERY.result_expires,
) )
initialise_celery(celery) gso_initialise_celery(celery)
return app return app
......
...@@ -10,14 +10,13 @@ from orchestrator import app_settings ...@@ -10,14 +10,13 @@ from orchestrator import app_settings
from orchestrator.db import init_database from orchestrator.db import init_database
from orchestrator.domain import SUBSCRIPTION_MODEL_REGISTRY from orchestrator.domain import SUBSCRIPTION_MODEL_REGISTRY
from orchestrator.log_config import LOGGER_OVERRIDES, logger_config from orchestrator.log_config import LOGGER_OVERRIDES, logger_config
from orchestrator.services.tasks import initialise_celery
from orchestrator.types import BroadcastFunc from orchestrator.types import BroadcastFunc
from orchestrator.websocket import broadcast_process_update_to_websocket, init_websocket_manager from orchestrator.websocket import broadcast_process_update_to_websocket, init_websocket_manager
from orchestrator.websocket.websocket_manager import WebSocketManager from orchestrator.websocket.websocket_manager import WebSocketManager
from orchestrator.workflows import ALL_WORKFLOWS from orchestrator.workflows import ALL_WORKFLOWS
from structlog import get_logger 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 from gso.settings import load_oss_params
logger = get_logger(__name__) logger = get_logger(__name__)
...@@ -104,7 +103,7 @@ celery.conf.update( ...@@ -104,7 +103,7 @@ celery.conf.update(
redbeat_redis_url=settings.CELERY.broker_url, redbeat_redis_url=settings.CELERY.broker_url,
) )
initialise_celery(celery) gso_initialise_celery(celery)
@worker_shutting_down.connect # type: ignore[misc] @worker_shutting_down.connect # type: ignore[misc]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment