import logging ; log = logging.getLogger('pymin.procman')
__all__ = ('ProcessManager', 'manager', 'register', 'unregister', 'call',
- 'start', 'stop', 'kill', 'get', 'has', 'sigchild_handler')
+ '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):
+ 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()
self.signal = None
self.process = None
self.error_count = 0
- self.running = False
def start(self):
assert self.process is None
self.restart()
def restart(self):
self.clear()
log.debug(u'ProcessInfo.restart(): executing %s', self.command)
- self.process = subprocess.Popen(self.command, *self.args, **self.kw)
- self.running = True
+ self.process = subprocess.Popen(self.command, *self.args, **self.kwargs)
def stop(self):
assert self.process is not None
self.dont_run = True
assert self.process is not None
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
def __repr__(self):
pid = None
if self.process is not None:
log.debug(u'ProcessManager()')
def register(self, name, command, callback=None, persist=False,
- *args, **kw):
- log.debug(u'ProcessManager.register(%s, %s, %s, %s, %s, %s)',
- name, command, callback, persist, 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)
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)
pi.start()
self.namemap[pi.name] = self.pidmap[pi.process.pid] = pi
- def call(self, name, command, callback=None, persist=False, *args, **kw):
- log.debug(u'ProcessManager.call(%s, %s, %s, %s, %s, %s)',
- name, command, callback, persist, args, kw)
- pi = ProcessInfo(name, command, callback, persist, args, kw)
+ def call(self, name, command, callback=None, persist=False,
+ max_errors=3, *args, **kwargs):
+ log.debug(u'ProcessManager.call(%s, %s, %s, %s, %s, %s, %s)',
+ name, command, callback, persist, max_errors, args, kwargs)
+ pi = ProcessInfo(name, command, callback, persist, max_errors,
+ args, kwargs)
self._call(pi)
def start(self, name):
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 call())
if name in self.namemap:
- self.namemap[name].stop()
- self.namemap[name].wait()
- self.namemap[name].restart()
+ pi = self.namemap[name]
+ pi.stop()
+ pi.process.wait()
+ pi.restart()
else:
- self.namemap[name].start()
+ self.services[name].start()
def kill(self, name, signum):
log.debug(u'ProcessManager.kill(%s, %s)', name, signum)
call = manager.call
start = manager.start
stop = manager.stop
+restart = manager.restart
kill = manager.kill
get = manager.get
has = manager.has
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
register('test-service', ('sleep', '2'), notify, True)
- register('test2', ('sleep', '3'), notify, False)
+ assert 'test-service' in manager.services
+ assert 'test-service' not in manager.namemap
+ assert not get('test-service').running
+
+ 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, SIGCHLD_handler)
- call('test', ('sleep', '5'), notify)
+ call('test-once', ('sleep', '5'), notify)
+ assert 'test-once' not in manager.services
+ assert 'test-once' in manager.namemap
+ assert get('test-once').running
+
start('test-service')
+ assert 'test-service' in manager.namemap
+ assert get('test-service').running
- print "Esperando...", [pi.name for pi in manager.namemap.values()]
+ 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
- print "Esperando...", [pi.name for pi in manager.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
+
+ call('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
projects / software / pymin.git / blobdiff