Merge pull request #1867 from Censio/rhunter-monit-startup

monit startup fix
9 years ago · eab5892944
parent 675d778b50 a59aa2cb34
commit eab5892944
1 changed files with 2 additions and 3 deletions
--- a/monitoring/monit.py
+++ b/monitoring/monit.py
@ -127,9 +127,8 @@ def main():
                module.exit_json(changed=True)
            status = run_command('reload')
            if status == '':
-                module.fail_json(msg='%s process not configured with monit' % name, name=name, state=state)
-            else:
-                module.exit_json(changed=True, name=name, state=state)
+                wait_for_monit_to_stop_pending()
+            module.exit_json(changed=True, name=name, state=state)
        module.exit_json(changed=False, name=name, state=state)

    wait_for_monit_to_stop_pending()