Add an example of process waiting to testcase.

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

diff --git a/pymin/procman.py b/pymin/procman.py
index dfa7873a1c2d840184e2ac84e54ca8d5a527f103..f6a393dc03325425ef03d84d72900583183f849e 100644 (file)
--- a/pymin/procman.py
+++ b/pymin/procman.py
@@ -6,19 +6,19 @@ import signal
 import subprocess
 import logging ; log = logging.getLogger('pymin.procman')
 
-__ALL__ = ('ProcessManager', 'manager', 'register', 'unregister', 'call',
-           'start', 'stop', 'kill', 'get', 'has', 'sigchild_handler')
+__all__ = ('ProcessManager', 'manager', 'register', 'unregister', 'call',
+           'start', 'stop', 'restart', 'kill', 'get', 'has', 'sigchild_handler')
 
 class ProcessInfo:
     def __init__(self, name, command, callback=None, persist=False,
-                       args=None, kw=None, max_errors=3):
+                 max_errors=3, args=None, kwargs=None):
         self.name = name
         self.command = command
         self.callback = callback
         if args is None: args = list()
         self.args = args
-        if kw is None: kw = dict()
-        self.kw = kw
+        if kwargs is None: kwargs = dict()
+        self.kwargs = kwargs
         self.persist = persist
         self.max_errors = max_errors
         self.clear()
@@ -34,7 +34,7 @@ class ProcessInfo:
     def restart(self):
         self.clear()
         log.debug(u'ProcessInfo.restart(): executing %s', self.command)
-        self.process = subprocess.Popen(self.command, *self.args, **self.kw)
+        self.process = subprocess.Popen(self.command, *self.args, **self.kwargs)
         self.running = True
     def stop(self):
         assert self.process is not None
@@ -68,11 +68,11 @@ class ProcessManager:
         log.debug(u'ProcessManager()')
 
     def register(self, name, command, callback=None, persist=False,
-                       *args, **kw):
-        log.debug(u'ProcessManager.register(%s, %s, %s, %s, %s, %s)',
-                      name, command, callback, persist, args, kw)
+                max_errors=3, *args, **kwargs):
+        log.debug(u'ProcessManager.register(%s, %s, %s, %s, %s, %s, %s)',
+                  name, command, callback, persist, max_errors, args, kwargs)
         self.services[name] = ProcessInfo(name, command, callback, persist,
-                                          args, kw)
+                                          max_errors, args, kwargs)
 
     def unregister(self, name):
         log.debug(u'ProcessManager.unregister(%s)', name)
@@ -82,10 +82,12 @@ class ProcessManager:
         pi.start()
         self.namemap[pi.name] = self.pidmap[pi.process.pid] = pi
 
-    def call(self, name, command, callback=None, persist=False, *args, **kw):
-        log.debug(u'ProcessManager.call(%s, %s, %s, %s, %s, %s)',
-                      name, command, callback, persist, args, kw)
-        pi = ProcessInfo(name, command, callback, persist, args, kw)
+    def call(self, name, command, callback=None, persist=False,
+                max_errors=3, *args, **kwargs):
+        log.debug(u'ProcessManager.call(%s, %s, %s, %s, %s, %s, %s)',
+                  name, command, callback, persist, max_errors, args, kwargs)
+        pi = ProcessInfo(name, command, callback, persist, max_errors,
+                         args, kwargs)
         self._call(pi)
 
     def start(self, name):
@@ -100,12 +102,15 @@ class ProcessManager:
 
     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:
-            self.namemap[name].stop()
-            self.namemap[name].wait()
-            self.namemap[name].restart()
+            pi = self.namemap[name]
+            pi.stop()
+            pi.process.wait()
+            pi.restart()
         else:
-            self.namemap[name].start()
+            self.services[name].start()
 
     def kill(self, name, signum):
         log.debug(u'ProcessManager.kill(%s, %s)', name, signum)
@@ -204,6 +209,7 @@ unregister = manager.unregister
 call = manager.call
 start = manager.start
 stop = manager.stop
+restart = manager.restart
 kill = manager.kill
 get = manager.get
 has = manager.has
@@ -229,24 +235,49 @@ if __name__ == '__main__':
             print 'test-service count =', count
             count += 1
             if count > 4:
-                print 'test-service not persistent anymore, start test2'
+                print 'set test-service non-persistent, start test-service-2'
                 pi.persist = False
-                pm.start('test2')
+                assert 'test-service-2' not in manager.namemap
+                pm.start('test-service-2')
+                assert 'test-service-2' in manager.namemap
         print 'died:', pi.name, pi.command
 
     register('test-service', ('sleep', '2'), notify, True)
-    register('test2', ('sleep', '3'), notify, False)
+    assert 'test-service' in manager.services
+    assert 'test-service' not in manager.namemap
+
+    register('test-service-2', ('sleep', '3'), notify, False)
+    assert 'test-service-2' in manager.services
+    assert 'test-service-2' not in manager.namemap
 
     signal.signal(signal.SIGCHLD, SIGCHLD_handler)
 
-    call('test', ('sleep', '5'), notify)
+    call('test-once', ('sleep', '5'), notify)
+    assert 'test-once' not in manager.services
+    assert 'test-once' in manager.namemap
+
     start('test-service')
+    assert 'test-service' in manager.namemap
 
-    print "Esperando...", [pi.name for pi in manager.namemap.values()]
+    print "Known processes:", manager.services.keys()
+    print "Waiting...", manager.namemap.keys()
+    print "------------------------------------------------------------------"
     while manager.pidmap:
         signal.pause()
         if sig == signal.SIGCHLD:
             sigchild_handler(sig)
             sig = None
-        print "Esperando...", [pi.name for pi in manager.namemap.values()]
+        print "Known processes:", manager.services.keys()
+        print "Waiting...", manager.namemap.keys()
+        print "------------------------------------------------------------------"
+    assert 'test-service' not in manager.namemap
+    assert 'test-service-2' not in manager.namemap
+    assert 'test-once' not in manager.services
+    assert 'test-once' not in manager.namemap
+
+    call('test-wait', ('sleep', '2'))
+    print 'test-wait returned?', get('test-wait').process.poll()
+    print 'Waiting test-wait to return...'
+    ret = get('test-wait').process.wait()
+    print 'Done! returned:', ret