Skip to content

Commit

Permalink
server: log the process occupying our port (#866)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlpinDale authored Dec 4, 2024
1 parent db96c2d commit 9fc6473
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
10 changes: 10 additions & 0 deletions aphrodite/common/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,16 @@ def get_open_port(port: Optional[int] = None) -> int:
return s.getsockname()[1]


def find_process_using_port(port: int) -> Optional[psutil.Process]:
for conn in psutil.net_connections():
if conn.laddr.port == port:
try:
return psutil.Process(conn.pid)
except psutil.NoSuchProcess:
return None
return None


def update_environment_variables(envs: Dict[str, str]):
for k, v in envs.items():
if k in os.environ and os.environ[k] != v:
Expand Down
8 changes: 7 additions & 1 deletion aphrodite/server/launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from fastapi import FastAPI, Response
from loguru import logger

from aphrodite.common.utils import in_windows
from aphrodite.common.utils import find_process_using_port, in_windows
from aphrodite.engine.async_aphrodite import AsyncEngineDeadError
from aphrodite.engine.protocol import AsyncEngineClient

Expand Down Expand Up @@ -47,6 +47,12 @@ async def dummy_shutdown() -> None:
await server_task
return dummy_shutdown()
except asyncio.CancelledError:
port = uvicorn_kwargs["port"]
process = find_process_using_port(port)
if process is not None:
logger.debug(
f"port {port} is used by process {process} launched with "
f"command:\n{' '.join(process.cmdline())}")
logger.info("Gracefully stopping http server")
return server.shutdown()

Expand Down

0 comments on commit 9fc6473

Please sign in to comment.