Call wait() on the Popen object instead of the ProcessInfo object.

[software/pymin.git] / pymin / procman.py

diff --git a/pymin/procman.py b/pymin/procman.py
index 359b3c03be686b049fbdf8507360c927badea21d..9e3cc92404df050e9d66c053fbeac1c823029599 100644 (file)
--- a/pymin/procman.py
+++ b/pymin/procman.py
@@ -7,7 +7,7 @@ import subprocess
 import logging ; log = logging.getLogger('pymin.procman')
 
 __all__ = ('ProcessManager', 'manager', 'register', 'unregister', 'call',
 import logging ; log = logging.getLogger('pymin.procman')
 
 __all__ = ('ProcessManager', 'manager', 'register', 'unregister', 'call',

-           'start', 'stop', 'kill', 'get', 'has', 'sigchild_handler')
+           'start', 'stop', 'restart', 'kill', 'get', 'has', 'sigchild_handler')

 
 class ProcessInfo:
     def __init__(self, name, command, callback=None, persist=False,
 
 class ProcessInfo:
     def __init__(self, name, command, callback=None, persist=False,


@@ -102,12 +102,15 @@ class ProcessManager:
 
     def restart(self, name):
         log.debug(u'ProcessManager.restart(%s)', name)
 
     def restart(self, name):
         log.debug(u'ProcessManager.restart(%s)', name)

+        # we have to check first in namemap in case is an unregistered
+        # process (added with call())

         if name in self.namemap:
         if name in self.namemap:

-            self.namemap[name].stop()
-            self.namemap[name].wait()
-            self.namemap[name].restart()
+            pi = self.namemap[name]
+            pi.stop()
+            pi.process.wait()
+            pi.restart()

         else:
         else:

-            self.namemap[name].start()
+            self.services[name].start()

 
     def kill(self, name, signum):
         log.debug(u'ProcessManager.kill(%s, %s)', name, signum)
 
     def kill(self, name, signum):
         log.debug(u'ProcessManager.kill(%s, %s)', name, signum)


@@ -206,6 +209,7 @@ unregister = manager.unregister
 call = manager.call
 start = manager.start
 stop = manager.stop
 call = manager.call
 start = manager.start
 stop = manager.stop

+restart = manager.restart

 kill = manager.kill
 get = manager.get
 has = manager.has
 kill = manager.kill
 get = manager.get
 has = manager.has