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

Fixup shell handling in monit module.

Browse source
This commit is contained in:
Michael DeHaan 2014-03-12 17:43:18 -04:00
parent 980653f20b
commit 376237d9d9
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
monitoring/monit
View file

@ -47,6 +47,7 @@ EXAMPLES = '''
- monit: name=httpd state=started - monit: name=httpd state=started
''' '''
import pipes
def main(): def main():
arg_spec = dict( arg_spec = dict(
@ -67,7 +68,7 @@ def main():
rc, out, err = module.run_command('%s reload' % MONIT) rc, out, err = module.run_command('%s reload' % MONIT)
module.exit_json(changed=True, name=name, state=state) module.exit_json(changed=True, name=name, state=state)
rc, out, err = module.run_command('%s summary | grep "Process \'%s\'"' % (MONIT, name)) rc, out, err = module.run_command('%s summary | grep "Process \'%s\'"' % (MONIT, pipes.quote(name)), use_unsafe_shell=True)
present = name in out present = name in out
if not present and not state == 'present': if not present and not state == 'present':
@ -78,7 +79,7 @@ def main():
if module.check_mode: if module.check_mode:
module.exit_json(changed=True) module.exit_json(changed=True)
module.run_command('%s reload' % MONIT, check_rc=True) module.run_command('%s reload' % MONIT, check_rc=True)
rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, name)) rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, pipes.quote(name)), use_unsafe_shell=True)
if name in out: if name in out:
module.exit_json(changed=True, name=name, state=state) module.exit_json(changed=True, name=name, state=state)
else: else:
@ -86,7 +87,7 @@ def main():
module.exit_json(changed=False, name=name, state=state) module.exit_json(changed=False, name=name, state=state)
rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, name)) rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, pipes.quote(name)), use_unsafe_shell=True)
running = 'running' in out.lower() running = 'running' in out.lower()
if running and (state == 'started' or state == 'monitored'): if running and (state == 'started' or state == 'monitored'):
@ -99,7 +100,7 @@ def main():
if module.check_mode: if module.check_mode:
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, pipes.quote(name)), use_unsafe_shell=True)
if 'not monitored' in out.lower() or 'stop pending' in out.lower(): 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)
@ -108,7 +109,8 @@ def main():
if module.check_mode: if module.check_mode:
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)) # FIXME: DRY FOLKS!
rc, out, err = module.run_command('%s summary | grep %s' % (MONIT, pipes.quote(name)), use_unsafe_shell=True)
if 'not monitored' in out.lower(): 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)