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 115f3b41e07fba0f7bda8adf65d3569504da94eb..87e3282224e8266e109a39e3c822bd8a20539908 100644 (file)
--- a/pymin/procman.py
+++ b/pymin/procman.py
@@ -25,7 +25,7 @@ class ProcessInfo:
     def clear(self):
         self._dont_run = False
         self._signal = None
-        self.process = None
+        self._process = None
         self.error_count = 0
     def start(self):
         assert self.process is None
@@ -33,7 +33,8 @@ 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.kwargs)
+        self._process = subprocess.Popen(self.command,
+                                         *self.args, **self.kwargs)
     def stop(self):
         assert self.process is not None
         self._dont_run = True
@@ -55,6 +56,9 @@ class ProcessInfo:
     @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:
@@ -76,12 +80,16 @@ class ProcessManager:
         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)
-        self.services[name] = ProcessInfo(name, command, callback, persist,
-                                          max_errors, args, kwargs)
+        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)
+        pi = self.services[name]
         del self.services[name]
+        return pi
 
     def _call(self, pi):
         pi.start()
@@ -95,6 +103,7 @@ class ProcessManager:
         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)
@@ -181,6 +190,8 @@ class ProcessManager:
             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
@@ -192,12 +203,8 @@ class ProcessManager:
             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__':
@@ -253,6 +260,9 @@ if __name__ == '__main__':
     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