Don't kill all PIDs connected to a port, only kill the LISTENING PIDs. This was accidentally killing the server, disconnecting everybody.

Author: samuelclay

server/utils/appium_driver.py

@@ -236,7 +236,7 @@ def _check_appium_health(self, email: str) -> bool:
         try:
             # Check if anything is listening on the port first
             port_check = subprocess.run(
-                ["lsof", "-i", f":{port}", "-t"], capture_output=True, text=True, check=False
+                ["lsof", "-i", f":{port}", "-sTCP:LISTEN", "-t"], capture_output=True, text=True, check=False
             )
             if not port_check.stdout.strip():
                 return False
@@ -417,7 +417,7 @@ def _kill_process_on_port(self, port: int):
         """Kill any process using the specified port."""
         try:
             port_check = subprocess.run(
-                ["lsof", "-i", f":{port}", "-t"], capture_output=True, text=True, check=False
+                ["lsof", "-i", f":{port}", "-sTCP:LISTEN", "-t"], capture_output=True, text=True, check=False
             )
             if port_check.stdout.strip():
                 pids = port_check.stdout.strip().split("\n")

server/utils/emulator_shutdown_manager.py

@@ -454,7 +454,9 @@ def _kill_process_on_port(self, port: int) -> None:  # noqa: ANN001, D401
         if not port:
             return
         try:
-            result = subprocess.run(["lsof", "-i", f":{port}", "-t"], capture_output=True, text=True)
+            result = subprocess.run(
+                ["lsof", "-i", f":{port}", "-sTCP:LISTEN", "-t"], capture_output=True, text=True
+            )
             for pid in filter(None, result.stdout.split()):
                 with contextlib.suppress(Exception):
                     os.kill(int(pid), signal.SIGTERM)