Make procman.ProcessManager return True is an action could be taken (refs #11).

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

diff --git a/pymin/procman.py b/pymin/procman.py
index 87e3282224e8266e109a39e3c822bd8a20539908..0bfb721018c6a61d6d3a30e72bad6cf8c6f0d361 100644 (file)
--- a/pymin/procman.py
+++ b/pymin/procman.py
@@ -26,7 +26,7 @@ class ProcessInfo:
         self._dont_run = False
         self._signal = None
         self._process = None
-        self.error_count = 0
+        self._error_count = 0
     def start(self):
         assert self.process is None
         self.restart()
@@ -59,6 +59,9 @@ class ProcessInfo:
     @property
     def process(self):
         return self._process
+    @property
+    def error_count(self):
+        return self._error_count
     def __repr__(self):
         pid = None
         if self.process is not None:
@@ -107,13 +110,17 @@ class ProcessManager:
 
     def start(self, name):
         log.debug(u'ProcessManager.start(%s)', name)
-        assert name not in self.namemap
-        self._call(self.services[name])
+        if name not in self.namemap:
+            self._call(self.services[name])
+            return True
+        return False
 
     def stop(self, name):
         log.debug(u'ProcessManager.stop(%s)', name)
-        assert name in self.namemap
-        self.namemap[name].stop()
+        if name in self.namemap:
+            self.namemap[name].stop()
+            return True
+        return False
 
     def restart(self, name):
         log.debug(u'ProcessManager.restart(%s)', name)
@@ -121,16 +128,24 @@ class ProcessManager:
         # process (added with once())
         if name in self.namemap:
             pi = self.namemap[name]
+            # the process will change its PID, so we delete it while we know it
+            del self.pidmap[pi.process.pid]
             pi.stop()
             pi.process.wait()
             pi.restart()
+            # add the new PID
+            self.pidmap[pi.process.pid] = pi
+            return True
         else:
-            self.services[name].start()
+            self.start(name)
+            return False
 
     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)
+        if name in self.namemap:
+            self.namemap[name].kill(name, stop)
+            return True
+        return False
 
     def sigchild_handler(self, signum, stack_frame=None):
         log.debug(u'ProcessManager.sigchild_handler(%s)', signum)
@@ -152,24 +167,25 @@ class ProcessManager:
                     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, '
                             u'max_errors=%s', p._dont_run, p.persist,
-                            p.error_count, p.max_errors)
+                            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
+                        p._error_count = 0
                         log.debug(u'ProcessManager.sigchild_handler: '
                                 u'return OK, resetting error_count')
                     else:
-                        p.error_count += 1
+                        p._error_count += 1
                         log.debug(u'ProcessManager.sigchild_handler: return'
-                                u'not 0, error_count + 1 = %s', p.error_count)
+                                u'not 0, error_count + 1 = %s', p._error_count)
                     del self.pidmap[pid]
                     p.restart()
                     self.pidmap[p.process.pid] = p
@@ -275,10 +291,20 @@ if __name__ == '__main__':
     assert 'test-once' not in manager.services
     assert 'test-once' in manager.namemap
     assert get('test-once').running
+    assert get('test-once').process.pid
+    pid = get('test-once').process.pid
+    restart('test-once')
+    assert pid != get('test-once').process.pid
+    assert pid != manager.pidmap[get('test-once').process.pid].process.pid
 
     start('test-service')
     assert 'test-service' in manager.namemap
     assert get('test-service').running
+    assert get('test-service').process.pid
+    pid = get('test-service').process.pid
+    restart('test-service')
+    assert pid != get('test-service').process.pid
+    assert pid != manager.pidmap[get('test-service').process.pid].process.pid
 
     print "Known processes:", manager.services.keys()
     print "Waiting...", manager.namemap.keys()
@@ -296,8 +322,12 @@ if __name__ == '__main__':
     assert 'test-once' not in manager.services
     assert 'test-once' not in manager.namemap
 
+    restart('test-service')
+    assert get('test-service').process.pid
+    assert manager.pidmap[get('test-service').process.pid].process.pid
+
     once('test-wait', ('sleep', '2'))
-    print 'test-wait returned?', get('test-wait').process.poll()
+    print 'test-wait running?', get('test-wait').running
     assert get('test-wait').running
     print 'Waiting test-wait to return...'
     ret = get('test-wait').process.wait()