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

Jump to bottom

Add SIGQUIT handler to UvicornWorker #1710

Merged
merged 5 commits into from Nov 1, 2022
Merged

Add SIGQUIT handler to UvicornWorker #1710

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b105e7
sigquit handling in uvicorn worker
adnaanbheda Oct 16, 2022
06a69d1
check for main thread not required
adnaanbheda Oct 28, 2022
2b348ef
close the sockets before closing down the servers
adnaanbheda Oct 28, 2022
6d5c58a
bRevert "close the sockets before closing down the servers"
adnaanbheda Oct 31, 2022
aa2431b
Update uvicorn/workers.py
Kludex Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions uvicorn/server.py
View file
Open in desktop
Expand Up @@ -252,11 +252,12 @@ async def on_tick(self, counter: int) -> bool:
async def shutdown(self, sockets: Optional[List[socket.socket]] = None) -> None:
logger.info("Shutting down")

# Close the sockets first before closing the servers
for sock in sockets or []:
sock.close()
# Stop accepting new connections.
for server in self.servers:
server.close()
for sock in sockets or []:
sock.close()
for server in self.servers:
await server.wait_closed()

Expand Down
10 changes: 10 additions & 0 deletions uvicorn/workers.py
View file
Open in desktop
Expand Up @@ -76,9 +76,19 @@ def init_signals(self) -> None:
# Don't let SIGUSR1 disturb active requests by interrupting system calls
signal.siginterrupt(signal.SIGUSR1, False)

def _install_sigquit_handler(self) -> None:
"""Workaround to install a SIGQUIT handler on workers.
Kludex marked this conversation as resolved.
Show resolved Hide resolved
- https://github.com/encode/uvicorn/issues/1116
- https://github.com/benoitc/gunicorn/issues/2604
"""

loop = asyncio.get_running_loop()
loop.add_signal_handler(signal.SIGQUIT, self.handle_exit, signal.SIGQUIT, None)

async def _serve(self) -> None:
self.config.app = self.wsgi
server = Server(config=self.config)
self._install_sigquit_handler()
await server.serve(sockets=self.sockets)
if not server.started:
sys.exit(Arbiter.WORKER_BOOT_ERROR)
Expand Down