Skip to content

Commit 5970ecb

Browse files
force shutdown
1 parent bea45b4 commit 5970ecb

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

packages/service-library/src/servicelib/fastapi/celery/app_server.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ async def run_until_shutdown(
3434
_logger.info("FastAPI initialized: %s", self.app)
3535
startup_completed_event.set()
3636
await self.shutdown_event.wait() # NOTE: wait here until shutdown is requested
37+
_logger.info("FastAPI shutdown completed: %s", self.app)

services/storage/tests/conftest.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from aws_library.s3 import SimcoreS3API
2424
from celery import Celery
2525
from celery.contrib.testing.worker import TestWorkController, start_worker
26-
from celery.signals import worker_init, worker_shutdown
26+
from celery.signals import worker_init
2727
from celery_library.worker.signals import _worker_init_wrapper, _worker_shutdown_wrapper
2828
from faker import Faker
2929
from fakeredis.aioredis import FakeRedis
@@ -1040,7 +1040,7 @@ async def with_storage_celery_worker(
10401040
_worker_init_wrapper(celery_app, app_server_factory_with_worker_mode),
10411041
weak=False,
10421042
)
1043-
worker_shutdown.connect(_worker_shutdown_wrapper(celery_app), weak=False)
1043+
# worker_shutdown.connect(_worker_shutdown_wrapper(celery_app), weak=False)
10441044

10451045
register_worker_tasks(celery_app)
10461046
register_test_tasks(celery_app)
@@ -1055,6 +1055,8 @@ async def with_storage_celery_worker(
10551055
) as worker:
10561056
yield worker
10571057

1058+
_worker_shutdown_wrapper(celery_app)()
1059+
10581060

10591061
@pytest.fixture
10601062
async def storage_rabbitmq_rpc_client(

0 commit comments

Comments
 (0)