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

migrate deprecated connections to net_connections #3641

Merged
merged 2 commits into from
Jul 11, 2024
Merged

migrate deprecated connections to net_connections #3641

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
102c1b6
migrate deprecated connections to net_connections
benedikt-bartscher Jul 9, 2024
fdf8ef8
check for psutil version
benedikt-bartscher Jul 9, 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
9 changes: 7 additions & 2 deletions reflex/utils/processes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import collections
import contextlib
import importlib.metadata
import os
import signal
import subprocess
Expand Down Expand Up @@ -58,8 +59,12 @@ def get_process_on_port(port) -> Optional[psutil.Process]:
"""
for proc in psutil.process_iter(["pid", "name", "cmdline"]):
try:
for conns in proc.connections(kind="inet"):
if conns.laddr.port == int(port):
if importlib.metadata.version("psutil") >= "6.0.0":
conns = proc.net_connections(kind="inet") # type: ignore
else:
conns = proc.connections(kind="inet")
for conn in conns:
if conn.laddr.port == int(port):
return proc
except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
pass
Expand Down
Loading