Skip to content

Commit da53aab

Browse files
fix: remove timeouts
1 parent 4c80da2 commit da53aab

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

packages/celery-library/src/celery_library/signals.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from celery import Celery # type: ignore[import-untyped]
66
from 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
88
from servicelib.logging_utils import log_context
99
from 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

6161
def on_worker_shutdown(sender, **_kwargs) -> None:

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import asyncio
2-
import datetime
32
import threading
43
from abc import ABC, abstractmethod
54
from asyncio import AbstractEventLoop
6-
from typing import Final, Generic, TypeVar
5+
from typing import Generic, TypeVar
76

87
from servicelib.celery.task_manager import TaskManager
98

10-
STARTUP_TIMEOUT: Final[float] = datetime.timedelta(minutes=1).total_seconds()
11-
129
T = 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

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
from datetime import timedelta
2-
from typing import Final
3-
41
from asgi_lifespan import LifespanManager
52
from fastapi import FastAPI
63

74
from ...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

137
class 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

0 commit comments

Comments
 (0)