service singleton (Chia-Network#6735)

mbwmbw1337 · Jun 24, 2021 · ab4f441 · ab4f441
1 parent 1b65328
commit ab4f441
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/chia/daemon/server.py b/chia/daemon/server.py
@@ -808,11 +808,6 @@ def launch_service(root_path: Path, service_command) -> Tuple[subprocess.Popen,
 
     log.debug(f"Launching service with CHIA_ROOT: {os.environ['CHIA_ROOT']}")
 
-    lockfile = singleton(service_launch_lock_path(root_path, service_command))
-    if lockfile is None:
-        logging.error(f"{service_command}: already running")
-        raise subprocess.SubprocessError
-
     # Insert proper e
     service_array = service_command.split()
     service_executable = executable_for_service(service_array[0])

diff --git a/chia/server/start_service.py b/chia/server/start_service.py
@@ -6,6 +6,7 @@
 from sys import platform
 from typing import Any, Callable, List, Optional, Tuple
 
+from chia.daemon.server import singleton, service_launch_lock_path
 from chia.server.ssl_context import chia_ssl_ca_paths, private_ssl_ca_paths
 
 try:
@@ -163,6 +164,10 @@ async def start(self, **kwargs) -> None:
             )
 
     async def run(self) -> None:
+        lockfile = singleton(service_launch_lock_path(self.root_path, self._service_name))
+        if lockfile is None:
+            self._log.error(f"{self._service_name}: already running")
+            raise ValueError(f"{self._service_name}: already running")
         await self.start()
         await self.wait_closed()