Skip to content

fix: stop idle embedded servers promptly on should_exit #3226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SwastikTripathi wants to merge 4 commits into from
Closed

fix: stop idle embedded servers promptly on should_exit #3226

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c299cc4
fix: stop idle embedded servers promptly on should_exit
SwastikTripathi Oct 23, 2026
4fb0bcb
fix: use call_soon_threadsafe for exit event; restore unconditional s…
SwastikTripathi Oct 23, 2026
432d101
test: cover should_exit=False path in exit event setter
SwastikTripathi Oct 23, 2026
8e5a9c1
fix: replace asyncio.wait_for with asyncio.timeout in main_loop
SwastikTripathi Oct 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions uvicorn/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,23 @@ def __init__(self, config: Config) -> None:
self.server_state = ServerState()

self.started = False
self.should_exit = False
self._should_exit = False
self._exit_event: asyncio.Event | None = None
self.force_exit = False
self.last_notified = 0.0

self._captured_signals: list[int] = []

@property
def should_exit(self) -> bool:
return self._should_exit

@should_exit.setter
def should_exit(self, value: bool) -> None:
self._should_exit = value
if value and self._exit_event is not None:
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
self._exit_event.set()
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Outdated
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Outdated
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

@functools.cached_property
def limit_max_requests(self) -> int | None:
if self.config.limit_max_requests is None:
Expand Down Expand Up @@ -240,12 +251,14 @@ def _log_started_message(self, listeners: Sequence[socket.SocketType]) -> None:
)

async def main_loop(self) -> None:
self._exit_event = asyncio.Event()
counter = 0
should_exit = await self.on_tick(counter)
while not should_exit:
counter += 1
counter = counter % 864000
await asyncio.sleep(0.1)
with contextlib.suppress(asyncio.TimeoutError):
await asyncio.wait_for(self._exit_event.wait(), timeout=0.1)
should_exit = await self.on_tick(counter)

async def on_tick(self, counter: int) -> bool:
Expand Down Expand Up @@ -290,7 +303,8 @@ async def shutdown(self, sockets: list[socket.socket] | None = None) -> None:
# Request shutdown on all existing connections.
for connection in list(self.server_state.connections):
connection.shutdown()
await asyncio.sleep(0.1)
if self.server_state.connections:
await asyncio.sleep(0.1)

try:
async with asyncio.timeout(self.config.timeout_graceful_shutdown):
Expand Down
Loading