devservices 1.2.3__tar.gz → 1.2.4__tar.gz

{devservices-1.2.3 → devservices-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devservices
-Version: 1.2.3
+Version: 1.2.4
 Requires-Python: >=3.11
 License-File: LICENSE.md
 Requires-Dist: pyyaml

{devservices-1.2.3 → devservices-1.2.4}/README.md

@@ -33,7 +33,7 @@ NOTE: service-name is an optional parameter. If not provided, devservices will a
 The recommended way to install devservices is through a virtualenv in the requirements.txt. Once that is installed and a devservices config file is added, you should be able to run `devservices up` to begin local development.
 
 ```
-devservices==1.2.3
+devservices==1.2.4
 ```
 
 ### 2. Add devservices config files

{devservices-1.2.3 → devservices-1.2.4}/devservices/utils/supervisor.py

@@ -53,6 +53,17 @@ class SupervisorDaemonState(IntEnum):
     SHUTDOWN = -1
 
 
+class SupervisorFaultCode(IntEnum):
+    """
+    Supervisor XML-RPC fault codes.
+
+    https://supervisord.org/api.html#xml-rpc-api-documentation
+    """
+
+    ALREADY_STARTED = 60
+    NOT_RUNNING = 70
+
+
 class UnixSocketHTTPConnection(http.client.HTTPConnection):
     """HTTP connection over Unix sockets."""
 
@@ -222,7 +233,12 @@ class SupervisorManager:
             if not isinstance(state, int):
                 return False
             return state == SupervisorProcessState.RUNNING
-        except xmlrpc.client.Fault:
+        except (
+            xmlrpc.client.Fault,
+            SupervisorConnectionError,
+            socket.error,
+            ConnectionRefusedError,
+        ):
             # If we can't get the process info, assume it's not running
             return False
 
@@ -295,6 +311,9 @@ class SupervisorManager:
             self._get_rpc_client().supervisor.shutdown()
         except xmlrpc.client.Fault as e:
             raise SupervisorError(f"Failed to stop supervisor: {e.faultString}")
+        except (SupervisorConnectionError, socket.error, ConnectionRefusedError):
+            # Supervisor is already down, nothing to do
+            pass
 
     def start_process(self, name: str) -> None:
         if self._is_program_running(name):
@@ -302,6 +321,10 @@ class SupervisorManager:
         try:
             self._get_rpc_client().supervisor.startProcess(name)
         except xmlrpc.client.Fault as e:
+            # ALREADY_STARTED is acceptable in concurrent scenarios
+            # where multiple threads may attempt to start the same process
+            if e.faultCode == SupervisorFaultCode.ALREADY_STARTED:
+                return
             raise SupervisorProcessError(
                 f"Failed to start process {name}: {e.faultString}"
             )
@@ -312,9 +335,16 @@ class SupervisorManager:
         try:
             self._get_rpc_client().supervisor.stopProcess(name)
         except xmlrpc.client.Fault as e:
+            # NOT_RUNNING is acceptable in concurrent scenarios
+            # where multiple threads may attempt to stop the same process
+            if e.faultCode == SupervisorFaultCode.NOT_RUNNING:
+                return
             raise SupervisorProcessError(
                 f"Failed to stop process {name}: {e.faultString}"
             )
+        except (SupervisorConnectionError, socket.error, ConnectionRefusedError):
+            # Supervisor is not available, process is already stopped
+            pass
 
     def get_program_command(self, program_name: str) -> str:
         opts = ServerOptions()

{devservices-1.2.3 → devservices-1.2.4}/devservices.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devservices
-Version: 1.2.3
+Version: 1.2.4
 Requires-Python: >=3.11
 License-File: LICENSE.md
 Requires-Dist: pyyaml

{devservices-1.2.3 → devservices-1.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devservices"
-version = "1.2.3"
+version = "1.2.4"
 # 3.11 is just for internal pypi compat
 requires-python = ">=3.11"
 dependencies = [