|
@@ -150,9 +150,9 @@ class StatusView(MeldView):
|
|
msg = process.stop()
|
|
msg = process.stop()
|
|
if not msg:
|
|
if not msg:
|
|
# XXX busywait
|
|
# XXX busywait
|
|
- while not process.finishmsg:
|
|
|
|
|
|
+ while process.pid:
|
|
supervisord.give_up()
|
|
supervisord.give_up()
|
|
- supervisord.kill_undead_processes()
|
|
|
|
|
|
+ supervisord.kill_undead()
|
|
supervisord.reap()
|
|
supervisord.reap()
|
|
process.spawn()
|
|
process.spawn()
|
|
message = 'Restarted %s at %s' % (processname, t)
|
|
message = 'Restarted %s at %s' % (processname, t)
|
|
@@ -160,11 +160,10 @@ class StatusView(MeldView):
|
|
message = msg
|
|
message = msg
|
|
if action == 'start':
|
|
if action == 'start':
|
|
process.spawn()
|
|
process.spawn()
|
|
- print "process pid", process.pid
|
|
|
|
# XXX busywait
|
|
# XXX busywait
|
|
time.sleep(.5)
|
|
time.sleep(.5)
|
|
supervisord.give_up()
|
|
supervisord.give_up()
|
|
- supervisord.kill_undead_processes()
|
|
|
|
|
|
+ supervisord.kill_undead()
|
|
supervisord.reap()
|
|
supervisord.reap()
|
|
message = 'Started %s at %s' % (processname, t)
|
|
message = 'Started %s at %s' % (processname, t)
|
|
if action == 'clearlog':
|
|
if action == 'clearlog':
|