Call ComposedSubHandler._attr() with cont parameter (closes #31)

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

diff --git a/pymin/procman.py b/pymin/procman.py
index 0bfb721018c6a61d6d3a30e72bad6cf8c6f0d361..269117b7b202196a99871ff8b042e179a4a8827e 100644 (file)
--- a/pymin/procman.py
+++ b/pymin/procman.py
@@ -68,7 +68,7 @@ class ProcessInfo:
             pid = self.process.pid
         return 'ProcessInfo(name=%s, pid=%s command=%s, persist=%s, cb=%s)' % (
                     self.name, pid, self.command, self.persist,
             pid = self.process.pid
         return 'ProcessInfo(name=%s, pid=%s command=%s, persist=%s, cb=%s)' % (
                     self.name, pid, self.command, self.persist,

-                    self.callback.__name__)
+                    self.callback and self.callback.__name__ or None)

 
 class ProcessManager:
 
 
 class ProcessManager:
 


@@ -78,19 +78,27 @@ class ProcessManager:
         self.pidmap = dict()
         log.debug(u'ProcessManager()')
 
         self.pidmap = dict()
         log.debug(u'ProcessManager()')
 

-    def register(self, name, command, callback=None, persist=False,
+    def register(self, name, command=None, callback=None, persist=False,

                 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)
                 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)

+        if not isinstance(name, ProcessInfo):
+            pi = ProcessInfo(name, command, callback, persist, max_errors,
+                             args, kwargs)
+        else:
+            pi = name
+            name = pi.name

         assert not self.has(name)
         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)
         self.services[name] = pi
         return pi
 
     def unregister(self, name):
         log.debug(u'ProcessManager.unregister(%s)', name)

-        pi = self.services[name]
+        if isinstance(name, ProcessInfo):
+            pi = name
+            name = pi.name
+        else:
+            pi = self.services[name]

         del self.services[name]
         return pi
 
         del self.services[name]
         return pi
 


@@ -98,18 +106,24 @@ class ProcessManager:
         pi.start()
         self.namemap[pi.name] = self.pidmap[pi.process.pid] = pi
 
         pi.start()
         self.namemap[pi.name] = self.pidmap[pi.process.pid] = pi
 

-    def once(self, name, command, callback=None, persist=False,
+    def once(self, name, command=None, 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)
                 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)

+        if not isinstance(name, ProcessInfo):
+            pi = ProcessInfo(name, command, callback, persist, max_errors,
+                             args, kwargs)
+        else:
+            pi = name
+            name = pi.name

         assert not self.has(name)
         assert not self.has(name)

-        pi = ProcessInfo(name, command, callback, persist, max_errors,
-                         args, kwargs)

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

+        if isinstance(name, ProcessInfo):
+            name = name.name

         if name not in self.namemap:
             self._call(self.services[name])
             return True
         if name not in self.namemap:
             self._call(self.services[name])
             return True


@@ -117,6 +131,8 @@ class ProcessManager:
 
     def stop(self, name):
         log.debug(u'ProcessManager.stop(%s)', name)
 
     def stop(self, name):
         log.debug(u'ProcessManager.stop(%s)', name)

+        if isinstance(name, ProcessInfo):
+            name = name.name

         if name in self.namemap:
             self.namemap[name].stop()
             return True
         if name in self.namemap:
             self.namemap[name].stop()
             return True


@@ -124,6 +140,8 @@ class ProcessManager:
 
     def restart(self, name):
         log.debug(u'ProcessManager.restart(%s)', name)
 
     def restart(self, name):
         log.debug(u'ProcessManager.restart(%s)', name)

+        if isinstance(name, ProcessInfo):
+            name = name.name

         # we have to check first in namemap in case is an unregistered
         # process (added with once())
         if name in self.namemap:
         # we have to check first in namemap in case is an unregistered
         # process (added with once())
         if name in self.namemap:


@@ -142,6 +160,8 @@ class ProcessManager:
 
     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)

+        if isinstance(name, ProcessInfo):
+            name = name.name

         if name in self.namemap:
             self.namemap[name].kill(name, stop)
             return True
         if name in self.namemap:
             self.namemap[name].kill(name, stop)
             return True