Monit fix - Use case insensitive comparison

reviewable/pr18780/r1
ryanaudiencepi 11 years ago
parent 3b89891dfe
commit 350db0cacf

@ -100,7 +100,7 @@ def main():
module.exit_json(changed=True) module.exit_json(changed=True)
module.run_command('%s stop %s' % (MONIT, name)) module.run_command('%s stop %s' % (MONIT, name))
rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, name)) rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, name))
if 'not monitored' in out or 'stop pending' in out: if 'not monitored' in out.lower() or 'stop pending' in out.lower():
module.exit_json(changed=True, name=name, state=state) module.exit_json(changed=True, name=name, state=state)
module.fail_json(msg=out) module.fail_json(msg=out)
@ -109,7 +109,7 @@ def main():
module.exit_json(changed=True) module.exit_json(changed=True)
module.run_command('%s unmonitor %s' % (MONIT, name)) module.run_command('%s unmonitor %s' % (MONIT, name))
rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, name)) rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, name))
if 'not monitored' in out: if 'not monitored' in out.lower():
module.exit_json(changed=True, name=name, state=state) module.exit_json(changed=True, name=name, state=state)
module.fail_json(msg=out) module.fail_json(msg=out)
@ -118,7 +118,7 @@ def main():
module.exit_json(changed=True) module.exit_json(changed=True)
module.run_command('%s restart %s' % (MONIT, name)) module.run_command('%s restart %s' % (MONIT, name))
rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, name)) rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, name))
if 'initializing' in out or 'restart pending' in out: if 'initializing' in out.lower() or 'restart pending' in out.lower():
module.exit_json(changed=True, name=name, state=state) module.exit_json(changed=True, name=name, state=state)
module.fail_json(msg=out) module.fail_json(msg=out)
@ -127,7 +127,7 @@ def main():
module.exit_json(changed=True) module.exit_json(changed=True)
module.run_command('%s start %s' % (MONIT, name)) module.run_command('%s start %s' % (MONIT, name))
rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, name)) rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, name))
if 'initializing' in out or 'start pending' in out: if 'initializing' in out.lower() or 'start pending' in out.lower():
module.exit_json(changed=True, name=name, state=state) module.exit_json(changed=True, name=name, state=state)
module.fail_json(msg=out) module.fail_json(msg=out)
@ -136,7 +136,7 @@ def main():
module.exit_json(changed=True) module.exit_json(changed=True)
module.run_command('%s monitor %s' % (MONIT, name)) module.run_command('%s monitor %s' % (MONIT, name))
rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, name)) rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, name))
if 'initializing' in out or 'start pending' in out: if 'initializing' in out.lower() or 'start pending' in out.lower():
module.exit_json(changed=True, name=name, state=state) module.exit_json(changed=True, name=name, state=state)
module.fail_json(msg=out) module.fail_json(msg=out)

Loading…
Cancel
Save