laipeng/reflex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate deprecated connections to net_connections (#3641)

Browse Source 
* migrate deprecated connections to net_connections

* check for psutil version
This commit is contained in:
benedikt-bartscher 2024-07-11 20:21:34 +02:00 committed by GitHub
parent 460afc2e10
commit 3c0cb3fd6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
reflex/utils/processes.py
View File

@ -4,6 +4,7 @@ from __future__ import annotations
import collections import collections
import contextlib import contextlib
import importlib.metadata
import os import os
import signal import signal
import subprocess import subprocess
@ -58,8 +59,12 @@ def get_process_on_port(port) -> Optional[psutil.Process]:
""" """
for proc in psutil.process_iter(["pid", "name", "cmdline"]): for proc in psutil.process_iter(["pid", "name", "cmdline"]):
try: try:
for conns in proc.connections(kind="inet"): if importlib.metadata.version("psutil") >= "6.0.0":
if conns.laddr.port == int(port): 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 return proc
except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess): except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
pass pass