Make some procman.ProcessManager's methods return the ProcessInfo instance.

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

diff --git a/pymin/procman.py b/pymin/procman.py
index dfa7873a1c2d840184e2ac84e54ca8d5a527f103..87e3282224e8266e109a39e3c822bd8a20539908 100644 (file)
--- a/pymin/procman.py
+++ b/pymin/procman.py
@@ -6,40 +6,39 @@ import signal
 import subprocess
 import logging ; log = logging.getLogger('pymin.procman')
 
 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', 'once',
+           '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,

-                       args=None, kw=None, max_errors=3):
-        self.name = name
+                 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
         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()
     def clear(self):
         self.persist = persist
         self.max_errors = max_errors
         self.clear()
     def clear(self):

-        self.dont_run = False
-        self.signal = None
-        self.process = None
+        self._dont_run = False
+        self._signal = None
+        self._process = None

         self.error_count = 0
         self.error_count = 0

-        self.running = False

     def start(self):
         assert self.process is None
         self.restart()
     def restart(self):
         self.clear()
         log.debug(u'ProcessInfo.restart(): executing %s', self.command)
     def start(self):
         assert self.process is None
         self.restart()
     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.running = True
+        self._process = subprocess.Popen(self.command,
+                                         *self.args, **self.kwargs)

     def stop(self):
         assert self.process is not None
     def stop(self):
         assert self.process is not None

-        self.dont_run = True
-        if self.signal == signal.SIGTERM or self.signal == signal.SIGKILL:
+        self._dont_run = True
+        if self._signal == signal.SIGTERM or self._signal == signal.SIGKILL:

             # Allready stopped, kill it
             self.kill(signal.SIGKILL)
         else:
             # Allready stopped, kill it
             self.kill(signal.SIGKILL)
         else:


@@ -50,7 +49,16 @@ class ProcessInfo:
                       self.process.pid, signum)
         assert self.process is not None
         os.kill(self.process.pid, signum)
                       self.process.pid, signum)
         assert self.process is not None
         os.kill(self.process.pid, signum)

-        self.signal = signum
+        self._signal = signum
+    @property
+    def running(self):
+        return self.process is not None and self.process.poll() is None
+    @property
+    def name(self):
+        return self._name
+    @property
+    def process(self):
+        return self._process

     def __repr__(self):
         pid = None
         if self.process is not None:
     def __repr__(self):
         pid = None
         if self.process is not None:


@@ -68,25 +76,34 @@ class ProcessManager:
         log.debug(u'ProcessManager()')
 
     def register(self, name, command, callback=None, persist=False,
         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)
-        self.services[name] = ProcessInfo(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)
+        assert not self.has(name)
+        pi = ProcessInfo(name, command, callback, persist, max_errors,
+                        args, kwargs)
+        self.services[name] = pi
+        return pi

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

+        pi = self.services[name]

         del self.services[name]
         del self.services[name]

+        return pi

 
     def _call(self, pi):
         pi.start()
         self.namemap[pi.name] = self.pidmap[pi.process.pid] = pi
 
 
     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):
-        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 once(self, name, command, callback=None, persist=False,
+                max_errors=3, *args, **kwargs):
+        log.debug(u'ProcessManager.once(%s, %s, %s, %s, %s, %s, %s)',
+                  name, command, callback, persist, max_errors, args, kwargs)
+        assert not self.has(name)
+        pi = ProcessInfo(name, command, callback, persist, max_errors,
+                         args, kwargs)

         self._call(pi)
         self._call(pi)

+        return pi

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


@@ -100,12 +117,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 once())

         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)


@@ -132,10 +152,10 @@ class ProcessManager:
                     log.debug(u'ProcessManager.sigchild_handler: '
                                   u'calling %s(%s)', p.callback.__name__, p)
                     p.callback(self, p)
                     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:
+                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, '
                     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,
+                            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.error_count, p.max_errors)
                     del self.namemap[p.name]
                     del self.pidmap[pid]


@@ -170,6 +190,8 @@ class ProcessManager:
             if name in self.pidmap:
                 return self.pidmap[name]
         raise KeyError, name
             if name in self.pidmap:
                 return self.pidmap[name]
         raise KeyError, name

+    # Syntax sugar for self[name]
+    __getitem__ = get

 
     def has(self, name):
         if isinstance(name, basestring): # is a name
 
     def has(self, name):
         if isinstance(name, basestring): # is a name


@@ -181,12 +203,8 @@ class ProcessManager:
             if name in self.pidmap:
                 return True
         return False
             if name in self.pidmap:
                 return True
         return False

-
-    def __getitem__(self, name):
-        return self.get(name)
-
-    def __contains__(self, name):
-        return self.has(name)
+    # Syntax sugar for name in self
+    __contains__ = has

 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':


@@ -201,9 +219,10 @@ if __name__ == '__main__':
 manager = ProcessManager()
 register = manager.register
 unregister = manager.unregister
 manager = ProcessManager()
 register = manager.register
 unregister = manager.unregister

-call = manager.call
+once = manager.once

 start = manager.start
 stop = manager.stop
 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


@@ -229,24 +248,58 @@ if __name__ == '__main__':
             print 'test-service count =', count
             count += 1
             if count > 4:
             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
                 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
+                assert get('test-service-2').running

         print 'died:', pi.name, pi.command
 
     register('test-service', ('sleep', '2'), notify, True)
         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
+    assert not get('test-service').running
+    assert manager['test-service'] == get('test-service')
+    assert has('test-service')
+    assert 'test-service' in manager
+
+    register('test-service-2', ('sleep', '3'), notify, False)
+    assert 'test-service-2' in manager.services
+    assert 'test-service-2' not in manager.namemap
+    assert not get('test-service-2').running

 
     signal.signal(signal.SIGCHLD, SIGCHLD_handler)
 
 
     signal.signal(signal.SIGCHLD, SIGCHLD_handler)
 

-    call('test', ('sleep', '5'), notify)
+    once('test-once', ('sleep', '5'), notify)
+    assert 'test-once' not in manager.services
+    assert 'test-once' in manager.namemap
+    assert get('test-once').running
+

     start('test-service')
     start('test-service')

+    assert 'test-service' in manager.namemap
+    assert get('test-service').running

 
 

-    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
     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
+
+    once('test-wait', ('sleep', '2'))
+    print 'test-wait returned?', get('test-wait').process.poll()
+    assert get('test-wait').running
+    print 'Waiting test-wait to return...'
+    ret = get('test-wait').process.wait()
+    print 'Done! returned:', ret