|  | 
| 24 | 24 | from celery import Celery | 
| 25 | 25 | from celery.contrib.testing.worker import TestWorkController, start_worker | 
| 26 | 26 | from celery.signals import worker_init, worker_shutdown | 
| 27 |  | -from celery.worker.worker import WorkController | 
| 28 |  | -from celery_library.signals import on_worker_init, on_worker_shutdown | 
|  | 27 | +from celery_library.worker.signals import _worker_init_wrapper, _worker_shutdown_wrapper | 
| 29 | 28 | from faker import Faker | 
| 30 | 29 | from fakeredis.aioredis import FakeRedis | 
| 31 | 30 | from fastapi import FastAPI | 
|  | 
| 70 | 69 | from settings_library.rabbit import RabbitSettings | 
| 71 | 70 | from simcore_postgres_database.models.tokens import tokens | 
| 72 | 71 | from simcore_postgres_database.storage_models import file_meta_data, projects, users | 
| 73 |  | -from simcore_service_storage.api._worker_tasks.tasks import setup_worker_tasks | 
|  | 72 | +from simcore_service_storage.api._worker_tasks.tasks import register_worker_tasks | 
| 74 | 73 | from simcore_service_storage.core.application import create_app | 
| 75 | 74 | from simcore_service_storage.core.settings import ApplicationSettings | 
| 76 | 75 | from simcore_service_storage.datcore_dsm import DatCoreDataManager | 
| @@ -1023,17 +1022,14 @@ async def with_storage_celery_worker( | 
| 1023 | 1022 |         service_name="storage-api", | 
| 1024 | 1023 |     ) | 
| 1025 | 1024 | 
 | 
| 1026 |  | -    app_server = FastAPIAppServer( | 
| 1027 |  | -        app=create_app(app_settings, tracing_config=tracing_config) | 
| 1028 |  | -    ) | 
| 1029 |  | - | 
| 1030 |  | -    def _on_worker_init_wrapper(sender: WorkController, **_kwargs): | 
| 1031 |  | -        return on_worker_init(sender, app_server, **_kwargs) | 
|  | 1025 | +    app_server = FastAPIAppServer(app=create_app(app_settings, tracing_config)) | 
| 1032 | 1026 | 
 | 
| 1033 |  | -    worker_init.connect(_on_worker_init_wrapper) | 
| 1034 |  | -    worker_shutdown.connect(on_worker_shutdown) | 
|  | 1027 | +    worker_init.connect( | 
|  | 1028 | +        _worker_init_wrapper(celery_app, lambda: app_server), weak=False | 
|  | 1029 | +    ) | 
|  | 1030 | +    worker_shutdown.connect(_worker_shutdown_wrapper(celery_app), weak=False) | 
| 1035 | 1031 | 
 | 
| 1036 |  | -    setup_worker_tasks(celery_app) | 
|  | 1032 | +    register_worker_tasks(celery_app) | 
| 1037 | 1033 |     register_celery_tasks(celery_app) | 
| 1038 | 1034 | 
 | 
| 1039 | 1035 |     with start_worker( | 
|  | 
0 commit comments