From 807e9fbe884cc51a19fed42999b07b21f3173121 Mon Sep 17 00:00:00 2001
From: hanli <37435717+hnl1@users.noreply.github.com>
Date: Sat, 28 Feb 2026 14:03:46 +0800
Subject: [PATCH] fix: ensure runner cleanup on any unix socket startup failure

---
 server.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/server.py b/server.py
index 62ff10c07..7b31e6992 100644
--- a/server.py
+++ b/server.py
@@ -1225,9 +1225,6 @@ class PromptServer():
         if sys.platform == 'win32':
             raise RuntimeError("Unix sockets are not supported on Windows. Please use --listen and --port instead.")
 
-        runner = web.AppRunner(self.app, access_log=None)
-        await runner.setup()
-
         if verbose:
             logging.info("Starting server\n")
 
@@ -1236,14 +1233,19 @@ class PromptServer():
             if not stat.S_ISSOCK(st_mode):
                 raise RuntimeError(f"Refusing to remove non-socket path: {unix_socket}")
             os.unlink(unix_socket)
-        site = web.UnixSite(runner, unix_socket)
-        await site.start()
+
+        runner = web.AppRunner(self.app, access_log=None)
+        await runner.setup()
         try:
+            site = web.UnixSite(runner, unix_socket)
+            await site.start()
             os.chmod(unix_socket, 0o660)
         except OSError as e:
-            await site.stop()
             await runner.cleanup()
-            raise RuntimeError(f"Failed to set socket permissions: {e}")
+            raise RuntimeError(f"Failed to set socket permissions: {e}") from e
+        except Exception:
+            await runner.cleanup()
+            raise
         self.address = unix_socket
         self.port = None
         self.unix_socket = unix_socket