runner: merge 2 functions stopping a process

slapos/runner/sup_process.py

@@ -39,15 +39,13 @@ def runProcesses(config, processes):
     waitForProcessEnd(proc)
 
 
-def stopIfRunning(config, process):
+def stopProcess(config, process):
+  """
+  Ask supervisor to stop a process
+  """
   if isRunning(config, process):
     server = xmlrpclib.Server(config['supervisord_server'])
-    slapos.stopProcess(process)
-
-
-def stopProcess(config, process):
-  server = xmlrpclib.Server(config['supervisord_server'])
-  server.supervisor.stopProcess(process)
+    server.supervisor.stopProcess(process)
 
 
 def stopProcesses(config, processes):

slapos/runner/utils.py

@@ -547,8 +547,8 @@ def configNewSR(config, projectpath):
   """
   folder = realpath(config, projectpath)
   if folder:
-    sup_process.stopIfRunning(config, 'slapgrid-cp')
-    sup_process.stopIfRunning(config, 'slapgrid-sr')
+    sup_process.stopProcess(config, 'slapgrid-cp')
+    sup_process.stopProcess(config, 'slapgrid-sr')
     stopProxy(config)
     removeProxyDb(config)
     startProxy(config)