Forráskód Böngészése

Renamed new RPC methods for consistency with the other methods:
- addProcess() is now addProcessGroup()
- removeProcessGroup() is now removeProcessGroup()

Updated documentation for this change and fixed inaccuracies. These
methods take a group name, not a group:process namespec as the
documentation previously stated.

Mike Naberezny 17 éve
szülő
commit
3e483101ae

+ 4 - 4
src/supervisor/rpcinterface.py

@@ -162,13 +162,13 @@ class SupervisorNamespaceRPCInterface:
         self.supervisord.options.mood = SupervisorStates.RESTARTING
         return True
 
-    def addProcess(self, name):
+    def addProcessGroup(self, name):
         """ Update the config for a running process from config file.
 
         @param string name         name of process to start
         @return boolean result     true if successful
         """
-        self._update('addProcess')
+        self._update('addProcessGroup')
 
         for config in self.supervisord.options.process_group_configs:
             if config.name == name:
@@ -178,13 +178,13 @@ class SupervisorNamespaceRPCInterface:
                 return True
         raise RPCError(Faults.BAD_NAME, name)
 
-    def removeProcess(self, name):
+    def removeProcessGroup(self, name):
         """ Remove a stopped process from the active configuration.
 
         @param string name         name of process to remove
         @return boolean result     Indicates wether the removal was successful
         """
-        self._update('removeProcess')
+        self._update('removeProcessGroup')
         if name not in self.supervisord.process_groups:
             raise RPCError(Faults.BAD_NAME, name)
 

+ 2 - 2
src/supervisor/supervisorctl.py

@@ -652,7 +652,7 @@ class DefaultControllerPlugin(ControllerPluginBase):
         supervisor = self.ctl.get_supervisor()
         for name in names:
             try:
-                supervisor.addProcess(name)
+                supervisor.addProcessGroup(name)
             except xmlrpclib.Fault, e:
                 if e.faultCode == xmlrpc.Faults.SHUTDOWN_STATE:
                     self.ctl.output('ERROR: shutting down')
@@ -676,7 +676,7 @@ class DefaultControllerPlugin(ControllerPluginBase):
         supervisor = self.ctl.get_supervisor()
         for name in names:
             try:
-                result = supervisor.removeProcess(name)
+                result = supervisor.removeProcessGroup(name)
             except xmlrpclib.Fault, e:
                 if e.faultCode == xmlrpc.Faults.STILL_RUNNING:
                     self.ctl.output('ERROR: process/group still running: %s'

+ 2 - 2
src/supervisor/tests/base.py

@@ -769,7 +769,7 @@ class DummySupervisorRPCNamespace:
     def reloadConfig(self):
         return [[['added'], ['changed'], ['dropped']]]
 
-    def addProcess(self, name):
+    def addProcessGroup(self, name):
         from xmlrpclib import Fault
         from supervisor import xmlrpc
         if name == 'ALREADY_ADDED':
@@ -781,7 +781,7 @@ class DummySupervisorRPCNamespace:
         else:
             self.processes = [name]
 
-    def removeProcess(self, name):
+    def removeProcessGroup(self, name):
         from xmlrpclib import Fault
         from supervisor import xmlrpc
         if name == 'STILL_RUNNING':

+ 11 - 11
src/supervisor/tests/test_rpcinterfaces.py

@@ -218,7 +218,7 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         self.assertEqual(value, True)
         self.assertEqual(supervisord.options.mood, 0)
 
-    def test_addProcess(self):
+    def test_addProcessGroup(self):
         from supervisor.supervisord import Supervisor
         from supervisor import xmlrpc
         options = DummyOptions()
@@ -229,19 +229,19 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
         interface = self._makeOne(supervisord)
 
-        result = interface.addProcess('group1')
+        result = interface.addProcessGroup('group1')
         self.assertTrue(result)
         self.assertEqual(supervisord.process_groups.keys(), ['group1'])
 
         self._assertRPCError(xmlrpc.Faults.ALREADY_ADDED,
-                             interface.addProcess, 'group1')
+                             interface.addProcessGroup, 'group1')
         self.assertEqual(supervisord.process_groups.keys(), ['group1'])
 
         self._assertRPCError(xmlrpc.Faults.BAD_NAME,
-                             interface.addProcess, 'asdf')
+                             interface.addProcessGroup, 'asdf')
         self.assertEqual(supervisord.process_groups.keys(), ['group1'])
 
-    def test_removeProcess(self):
+    def test_removeProcessGroup(self):
         from supervisor.supervisord import Supervisor
         options = DummyOptions()
         supervisord = Supervisor(options)
@@ -251,12 +251,12 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
         interface = self._makeOne(supervisord)
 
-        interface.addProcess('group1')
-        result = interface.removeProcess('group1')
+        interface.addProcessGroup('group1')
+        result = interface.removeProcessGroup('group1')
         self.assertTrue(result)
         self.assertEqual(supervisord.process_groups.keys(), [])
 
-    def test_removeProcess_bad_name(self):
+    def test_removeProcessGroup_bad_name(self):
         from supervisor.supervisord import Supervisor
         from supervisor import xmlrpc
         options = DummyOptions()
@@ -268,9 +268,9 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         interface = self._makeOne(supervisord)
 
         self._assertRPCError(xmlrpc.Faults.BAD_NAME,
-                             interface.removeProcess, 'asdf')
+                             interface.removeProcessGroup, 'asdf')
 
-    def test_removeProcess_still_running(self):
+    def test_removeProcessGroup_still_running(self):
         from supervisor.supervisord import Supervisor
         from supervisor import xmlrpc
         options = DummyOptions()
@@ -283,7 +283,7 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         supervisord.process_groups = {'group1':process}
         interface = self._makeOne(supervisord)
         self._assertRPCError(xmlrpc.Faults.STILL_RUNNING,
-                             interface.removeProcess, 'group1')
+                             interface.removeProcessGroup, 'group1')
 
 
     def test_startProcess_already_started(self):