X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/9c443d159056e112ed23af07afa38022882583b3..1017502ba4bfa740fd73812f11feea2e3476e71d:/pymin/procman.py?ds=sidebyside diff --git a/pymin/procman.py b/pymin/procman.py index e0f3017..554fdba 100644 --- a/pymin/procman.py +++ b/pymin/procman.py @@ -4,47 +4,61 @@ import os import errno import signal import subprocess +import logging ; log = logging.getLogger('pymin.procman') + +__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, - 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 - 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.dont_run = False - self.signal = None - self.process = None + self._dont_run = False + 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) - self.running = True + log.debug(u'ProcessInfo.restart(): executing %s', self.command) + self._process = subprocess.Popen(self.command, + *self.args, **self.kwargs) 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: # 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) - self.signal = signum + os.kill(self.process.pid, 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: @@ -59,56 +73,98 @@ 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) + assert not self.has(name) 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 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) 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 once()) + 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: + 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 +175,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 +184,11 @@ class ProcessManager: else: # is a pid if name in self.pidmap: return self.pidmap[name] - return KeyError, name + raise KeyError, name + # Syntax sugar for self[name] + __getitem__ = get - def __contains__(self, name): + def has(self, name): if isinstance(name, basestring): # is a name if name in self.namemap: return True @@ -140,6 +198,30 @@ class ProcessManager: if name in self.pidmap: return True return False + # Syntax sugar for name in self + __contains__ = has + + +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 +once = manager.once +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 +232,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 +243,58 @@ 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 + assert get('test-service-2').running 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 + assert not get('test-service').running + assert manager['test-service'] == get('test-service') + assert has('test-service') + assert 'test-service' in manager - 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 + assert not get('test-service-2').running - signal.signal(signal.SIGCHLD, sigchild_handler) + signal.signal(signal.SIGCHLD, SIGCHLD_handler) - procman.call('test', ('sleep', '5'), notify) - procman.start('test-service') + once('test-once', ('sleep', '5'), notify) + assert 'test-once' not in manager.services + assert 'test-once' in manager.namemap + assert get('test-once').running - while procman.pidmap: - time.sleep(1) + start('test-service') + assert 'test-service' in manager.namemap + assert get('test-service').running + + 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 + + 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