File tree Expand file tree Collapse file tree 3 files changed +7
-16
lines changed
celery-library/src/celery_library
service-library/src/servicelib Expand file tree Collapse file tree 3 files changed +7
-16
lines changed Original file line number Diff line number Diff line change 44
55from celery import Celery # type: ignore[import-untyped]
66from celery .worker .worker import WorkController # type: ignore[import-untyped]
7- from servicelib .celery .app_server import STARTUP_TIMEOUT , BaseAppServer
7+ from servicelib .celery .app_server import BaseAppServer
88from servicelib .logging_utils import log_context
99from settings_library .celery import CelerySettings
1010
@@ -55,7 +55,7 @@ async def _setup_task_manager():
5555 )
5656 thread .start ()
5757
58- startup_complete_event .wait (STARTUP_TIMEOUT * 1.1 )
58+ startup_complete_event .wait ()
5959
6060
6161def on_worker_shutdown (sender , ** _kwargs ) -> None :
Original file line number Diff line number Diff line change 11import asyncio
2- import datetime
32import threading
43from abc import ABC , abstractmethod
54from asyncio import AbstractEventLoop
6- from typing import Final , Generic , TypeVar
5+ from typing import Generic , TypeVar
76
87from servicelib .celery .task_manager import TaskManager
98
10- STARTUP_TIMEOUT : Final [float ] = datetime .timedelta (minutes = 1 ).total_seconds ()
11-
129T = TypeVar ("T" )
1310
1411
@@ -42,11 +39,11 @@ async def on_startup(self) -> None:
4239 raise NotImplementedError
4340
4441 async def startup (
45- self , completed_event : threading .Event , shutdown_event : asyncio .Event
42+ self , startup_completed_event : threading .Event , shutdown_event : asyncio .Event
4643 ) -> None :
4744 self ._shutdown_event = shutdown_event
48- completed_event .set ()
4945 await self .on_startup ()
46+ startup_completed_event .set ()
5047 await self ._shutdown_event .wait ()
5148
5249 @abstractmethod
Original file line number Diff line number Diff line change 1- from datetime import timedelta
2- from typing import Final
3-
41from asgi_lifespan import LifespanManager
52from fastapi import FastAPI
63
74from ...celery .app_server import BaseAppServer
85
9- _SHUTDOWN_TIMEOUT : Final [float ] = timedelta (seconds = 10 ).total_seconds ()
10- _STARTUP_TIMEOUT : Final [float ] = timedelta (minutes = 1 ).total_seconds ()
11-
126
137class FastAPIAppServer (BaseAppServer [FastAPI ]):
148 def __init__ (self , app : FastAPI ):
@@ -18,8 +12,8 @@ def __init__(self, app: FastAPI):
1812 async def on_startup (self ) -> None :
1913 self ._lifespan_manager = LifespanManager (
2014 self .app ,
21- startup_timeout = _STARTUP_TIMEOUT ,
22- shutdown_timeout = _SHUTDOWN_TIMEOUT ,
15+ startup_timeout = None ,
16+ shutdown_timeout = None ,
2317 )
2418 await self ._lifespan_manager .__aenter__ ()
2519
You can’t perform that action at this time.
0 commit comments