From f510389298ba559ea2586b5bde9c5c1e8fd02952 Mon Sep 17 00:00:00 2001 From: Chris Lamb Date: Thu, 8 May 2014 18:18:28 +0100 Subject: [PATCH] Fail if monit reload failed; don't mask the error. This is necessary for the scenario when you push a new, broken monit config out, and then set a state=reloaded handler - the error was previously swallowed so you could end up with successful play but missing monitoring (!). Signed-off-by: Chris Lamb --- library/monitoring/monit | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/monitoring/monit b/library/monitoring/monit index 0705b714315..64daf2614d5 100644 --- a/library/monitoring/monit +++ b/library/monitoring/monit @@ -66,6 +66,8 @@ def main(): if module.check_mode: module.exit_json(changed=True) rc, out, err = module.run_command('%s reload' % MONIT) + if rc != 0: + module.fail_json(msg='monit reload failed', stdout=out, stderr=err) module.exit_json(changed=True, name=name, state=state) rc, out, err = module.run_command('%s summary | grep "Process \'%s\'"' % (MONIT, pipes.quote(name)), use_unsafe_shell=True)