cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1519 from kmadac/devel

Browse source 
Error handling in supervisorctl module.
This commit is contained in:
Brian Coca 2015-06-15 09:33:30 -04:00
commit 400f8d9350
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web_infrastructure/supervisorctl.py
View file

@ -183,14 +183,14 @@ def main():
if module.check_mode: if module.check_mode:
module.exit_json(changed=True) module.exit_json(changed=True)
for process_name in to_take_action_on: for process_name in to_take_action_on:
rc, out, err = run_supervisorctl(action, process_name) rc, out, err = run_supervisorctl(action, process_name, check_rc=True)
if '%s: %s' % (process_name, expected_result) not in out: if '%s: %s' % (process_name, expected_result) not in out:
module.fail_json(msg=out) module.fail_json(msg=out)
module.exit_json(changed=True, name=name, state=state, affected=to_take_action_on) module.exit_json(changed=True, name=name, state=state, affected=to_take_action_on)
if state == 'restarted': if state == 'restarted':
rc, out, err = run_supervisorctl('update') rc, out, err = run_supervisorctl('update', check_rc=True)
processes = get_matched_processes() processes = get_matched_processes()
take_action_on_processes(processes, lambda s: True, 'restart', 'started') take_action_on_processes(processes, lambda s: True, 'restart', 'started')