Kludex/uvicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve bind sockets in _serve instead of startup

Browse Source 
Move the bind socket resolution from startup() to _serve() so startup
doesn't need to know about config.bind. The resolved sockets flow into
both startup and shutdown through the existing parameter.
This commit is contained in:
Marcelo Trylesinski 2026-02-16 23:02:34 +01:00
parent a5be29d5c1
commit 1af635b532
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
uvicorn/server.py
View File

@ -77,6 +77,9 @@ class Server:
if not config.loaded:
config.load()
if sockets is None and config.bind is not None:
sockets = config.bind_sockets()
self.lifespan = config.lifespan_class(config)
message = "Started server process [%d]"
@ -101,9 +104,6 @@ class Server:
config = self.config
if sockets is None and config.bind is not None:
sockets = config.bind_sockets()
def create_protocol(
_loop: asyncio.AbstractEventLoop | None = None,
) -> asyncio.Protocol:
@ -121,9 +121,7 @@ class Server:
# Explicitly passed a list of open sockets.
# We use this when the server is run from a Gunicorn worker.
def _share_socket(
sock: socket.SocketType,
) -> socket.SocketType: # pragma py-not-win32
def _share_socket(sock: socket.SocketType) -> socket.SocketType: # pragma py-not-win32
# Windows requires the socket be explicitly shared across
# multiple workers (processes).
from socket import fromshare # type: ignore[attr-defined]