Просмотр исходного кода

Return name with all NOT_RUNNING and STILL_RUNNING faults

Mike Naberezny 9 лет назад
Родитель
Сommit
8081679ab7
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      supervisor/rpcinterface.py

+ 3 - 3
supervisor/rpcinterface.py

@@ -209,7 +209,7 @@ class SupervisorNamespaceRPCInterface:
 
 
         result = self.supervisord.remove_process_group(name)
         result = self.supervisord.remove_process_group(name)
         if not result:
         if not result:
-            raise RPCError(Faults.STILL_RUNNING)
+            raise RPCError(Faults.STILL_RUNNING, name)
         return True
         return True
 
 
     def _getAllProcesses(self, lexical=False):
     def _getAllProcesses(self, lexical=False):
@@ -387,7 +387,7 @@ class SupervisorNamespaceRPCInterface:
             return self.stopProcessGroup(group_name, wait)
             return self.stopProcessGroup(group_name, wait)
 
 
         if process.get_state() not in RUNNING_STATES:
         if process.get_state() not in RUNNING_STATES:
-            raise RPCError(Faults.NOT_RUNNING)
+            raise RPCError(Faults.NOT_RUNNING, name)
 
 
         msg = process.stop()
         msg = process.stop()
         if msg is not None:
         if msg is not None:
@@ -486,7 +486,7 @@ class SupervisorNamespaceRPCInterface:
             raise RPCError(Faults.BAD_SIGNAL, signal)
             raise RPCError(Faults.BAD_SIGNAL, signal)
 
 
         if process.get_state() not in RUNNING_STATES:
         if process.get_state() not in RUNNING_STATES:
-            raise RPCError(Faults.NOT_RUNNING)
+            raise RPCError(Faults.NOT_RUNNING, name)
 
 
         msg = process.signal(sig)
         msg = process.signal(sig)