X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/55139aca1f264af5d972f2f76165a67388f007fa..45d91d1b75b9aed9abbbae97ff962ab08f215177:/pymin/procman.py?ds=sidebyside diff --git a/pymin/procman.py b/pymin/procman.py index ab6953a..4478cb7 100644 --- a/pymin/procman.py +++ b/pymin/procman.py @@ -26,7 +26,6 @@ class ProcessInfo: 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 @@ -46,7 +45,7 @@ class ProcessInfo: self.kill(signal.SIGTERM) def kill(self, signum): assert self.process is not None - os.kill(pi.process.pid, signum) + os.kill(self.process.pid, signum) self.signal = signum def __repr__(self): pid = None @@ -85,7 +84,16 @@ class ProcessManager: def stop(self, name): assert name in self.namemap - self.namemap[name].stop(name) + self.namemap[name].stop() + + def restart(self, name): + logging.debug(u'ProcessManager.restart(%s)', name) + if name in self.namemap: + self.namemap[name].stop() + self.namemap[name].wait() + self.namemap[name].restart() + else: + self.namemap[name].start() def kill(self, name, signum): assert name in self.namemap @@ -101,6 +109,7 @@ class ProcessManager: while pid: if pid in self.pidmap: p = self.pidmap[pid] + p.process.returncode = status if p.callback is not None: p.callback(self, p) if p.dont_run or not p.persist or p.error_count >= p.max_errors: @@ -131,7 +140,7 @@ class ProcessManager: else: # is a pid if name in self.pidmap: return self.pidmap[name] - return KeyError, name + raise KeyError, name def has(self, name): if isinstance(name, basestring): # is a name @@ -199,7 +208,7 @@ if __name__ == '__main__': while manager.pidmap: signal.pause() if sig == signal.SIGCHLD: - sig = None sigchild_handler(sig) + sig = None print "Esperando...", [pi.name for pi in manager.namemap.values()]