Skip to content
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

fix: make sure always execute the shutdown logic, even if server rece… #2510

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: make sure always execute the shutdown logic, even if server rece… #2510

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6e2207
fix: make sure always execute the shutdown logic, even if server rece…
xianml Nov 13, 2024
152da33
fix: test case error
xianml Nov 21, 2024
05b1ec2
fix: test case
xianml Nov 21, 2024
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
15 changes: 9 additions & 6 deletions uvicorn/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,9 @@ async def _serve(self, sockets: list[socket.socket] | None = None) -> None:
logger.info(message, process_id, extra={"color_message": color_message})

await self.startup(sockets=sockets)
if self.should_exit:
return
# FIX: make sure always execute the shutdown logic, even if server received a signal during startup
# if self.should_exit:
# return
await self.main_loop()
await self.shutdown(sockets=sockets)

Expand Down Expand Up @@ -262,8 +263,9 @@ async def shutdown(self, sockets: list[socket.socket] | None = None) -> None:
logger.info("Shutting down")

# Stop accepting new connections.
for server in self.servers:
server.close()
if hasattr(self, "servers") and self.servers:
for server in self.servers:
server.close()
for sock in sockets or []:
sock.close() # pragma: full coverage

Expand Down Expand Up @@ -308,8 +310,9 @@ async def _wait_tasks_to_complete(self) -> None:
while self.server_state.tasks and not self.force_exit:
await asyncio.sleep(0.1)

for server in self.servers:
await server.wait_closed()
if hasattr(self, "servers") and self.servers:
for server in self.servers:
await server.wait_closed()

@contextlib.contextmanager
def capture_signals(self) -> Generator[None, None, None]:
Expand Down
Loading