X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/9c443d159056e112ed23af07afa38022882583b3..2f68311579c5a7179c2e6d2202034a1e7d8fff2a:/pymin/procman.py?ds=sidebyside

diff --git a/pymin/procman.py b/pymin/procman.py
index e0f3017..f6a393d 100644
--- a/pymin/procman.py
+++ b/pymin/procman.py
@@ -4,17 +4,21 @@ import os
 import errno
 import signal
 import subprocess
+import logging ; log = logging.getLogger('pymin.procman')
+
+__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()
@@ -23,14 +27,14 @@ class ProcessInfo:
         self.signal = None
         self.process = None
         self.error_count = 0
-        self.last_return = None
         self.running = False
     def start(self):
         assert self.process is None
         self.restart()
     def restart(self):
         self.clear()
-        self.process = subprocess.Popen(self.command, *self.args, **self.kw)
+        log.debug(u'ProcessInfo.restart(): executing %s', self.command)
+        self.process = subprocess.Popen(self.command, *self.args, **self.kwargs)
         self.running = True
     def stop(self):
         assert self.process is not None
@@ -42,8 +46,10 @@ class ProcessInfo:
             # Stop it
             self.kill(signal.SIGTERM)
     def kill(self, signum):
+        log.debug(u'ProcessInfo.kill(): killing pid %s with signal %s',
+                      self.process.pid, signum)
         assert self.process is not None
-        os.kill(pi.process.pid, signum)
+        os.kill(self.process.pid, signum)
         self.signal = signum
     def __repr__(self):
         pid = None
@@ -59,56 +65,96 @@ class ProcessManager:
         self.services = dict()
         self.namemap = dict()
         self.pidmap = dict()
+        log.debug(u'ProcessManager()')
 
     def register(self, name, command, callback=None, persist=False,
-                       *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)
         del self.services[name]
 
     def _call(self, pi):
         pi.start()
         self.namemap[pi.name] = self.pidmap[pi.process.pid] = pi
 
-    def call(self, name, command, callback=None, persist=False, *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):
+        log.debug(u'ProcessManager.start(%s)', name)
         assert name not in self.namemap
         self._call(self.services[name])
 
     def stop(self, name):
+        log.debug(u'ProcessManager.stop(%s)', name)
         assert name in self.namemap
-        self.namemap[name].stop(name)
+        self.namemap[name].stop()
+
+    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:
+            pi = self.namemap[name]
+            pi.stop()
+            pi.process.wait()
+            pi.restart()
+        else:
+            self.services[name].start()
 
     def kill(self, name, signum):
+        log.debug(u'ProcessManager.kill(%s, %s)', name, signum)
         assert name in self.namemap
         self.namemap[name].kill(name, stop)
 
-    def sigchild_handler(self, signum):
+    def sigchild_handler(self, signum, stack_frame=None):
+        log.debug(u'ProcessManager.sigchild_handler(%s)', signum)
         try:
             (pid, status) = os.waitpid(-1, os.WNOHANG)
         except OSError, e:
-            if e.errno is e.ECHILD:
+            log.debug(u'ProcessManager.sigchild_handler(): OSError')
+            if e.errno is errno.ECHILD:
+                log.debug(u'ProcessManager.sigchild_handler(): OSError ECHILD')
                 return
             raise
+        log.debug(u'ProcessManager.sigchild_handler: pid=%s, status=%s',
+                      pid, status)
         while pid:
             if pid in self.pidmap:
                 p = self.pidmap[pid]
+                p.process.returncode = status
                 if p.callback is not None:
+                    log.debug(u'ProcessManager.sigchild_handler: '
+                                  u'calling %s(%s)', p.callback.__name__, p)
                     p.callback(self, p)
                 if p.dont_run or not p.persist or p.error_count >= p.max_errors:
+                    log.debug(u"ProcessManager.sigchild_handler: can't "
+                            u'persist, dont_run=%s, persist=%s, error_cout=%s, '
+                            u'max_errors=%s', p.dont_run, p.persist,
+                            p.error_count, p.max_errors)
                     del self.namemap[p.name]
                     del self.pidmap[pid]
                     p.clear()
                 else:
+                    log.debug(u'ProcessManager.sigchild_handler: persist')
                     if p.process.returncode == 0:
                         p.error_count = 0
+                        log.debug(u'ProcessManager.sigchild_handler: '
+                                u'return OK, resetting error_count')
                     else:
                         p.error_count += 1
+                        log.debug(u'ProcessManager.sigchild_handler: return'
+                                u'not 0, error_count + 1 = %s', p.error_count)
                     del self.pidmap[pid]
                     p.restart()
                     self.pidmap[p.process.pid] = p
@@ -119,7 +165,7 @@ class ProcessManager:
                     return
                 raise
 
-    def __getitem__(self, name):
+    def get(self, name):
         if isinstance(name, basestring): # is a name
             if name in self.namemap:
                 return self.namemap[name]
@@ -128,9 +174,9 @@ class ProcessManager:
         else: # is a pid
             if name in self.pidmap:
                 return self.pidmap[name]
-        return KeyError, name
+        raise KeyError, name
 
-    def __contains__(self, name):
+    def has(self, name):
         if isinstance(name, basestring): # is a name
             if name in self.namemap:
                 return True
@@ -141,6 +187,34 @@ class ProcessManager:
                 return True
         return False
 
+    def __getitem__(self, name):
+        return self.get(name)
+
+    def __contains__(self, name):
+        return self.has(name)
+
+
+if __name__ == '__main__':
+    logging.basicConfig(
+        level   = logging.DEBUG,
+        format  = '%(asctime)s %(levelname)-8s %(message)s',
+        datefmt = '%H:%M:%S',
+    )
+
+
+# Globals
+manager = ProcessManager()
+register = manager.register
+unregister = manager.unregister
+call = manager.call
+start = manager.start
+stop = manager.stop
+restart = manager.restart
+kill = manager.kill
+get = manager.get
+has = manager.has
+sigchild_handler = manager.sigchild_handler
+
 
 if __name__ == '__main__':
 
@@ -150,7 +224,7 @@ if __name__ == '__main__':
     sig = None
     count = 0
 
-    def sigchild_handler(signum, stacktrace):
+    def SIGCHLD_handler(signum, stacktrace):
         global sig
         sig = signum
         print 'SIGCHLD', signum
@@ -161,25 +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
 
-    procman = ProcessManager()
+    register('test-service', ('sleep', '2'), notify, True)
+    assert 'test-service' in manager.services
+    assert 'test-service' not in manager.namemap
 
-    procman.register('test-service', ('sleep', '2'), notify, True)
-    procman.register('test2', ('sleep', '3'), notify, False)
+    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, sigchild_handler)
+    signal.signal(signal.SIGCHLD, SIGCHLD_handler)
 
-    procman.call('test', ('sleep', '5'), notify)
-    procman.start('test-service')
+    call('test-once', ('sleep', '5'), notify)
+    assert 'test-once' not in manager.services
+    assert 'test-once' in manager.namemap
 
-    while procman.pidmap:
-        time.sleep(1)
+    start('test-service')
+    assert 'test-service' in manager.namemap
+
+    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
-            procman.sigchild_handler(sig)
-        print "Esperando...", [pi.name for pi in procman.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