From 350db0cacfcaf91228b9c361110f1f24f96ee49d Mon Sep 17 00:00:00 2001
From: ryanaudiencepi <ryanaudiencepi@users.noreply.github.com>
Date: Thu, 3 Oct 2013 02:46:35 +0800
Subject: [PATCH] Monit fix - Use case insensitive comparison
---
monitoring/monit | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/monitoring/monit b/monitoring/monit
index e40768f6421..79ef5aa752c 100644
--- a/monitoring/monit
+++ b/monitoring/monit
@@ -100,7 +100,7 @@ def main():
module.exit_json(changed=True)
module.run_command('%s stop %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.fail_json(msg=out)
@@ -109,7 +109,7 @@ def main():
module.exit_json(changed=True)
module.run_command('%s unmonitor %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.fail_json(msg=out)
@@ -118,7 +118,7 @@ def main():
module.exit_json(changed=True)
module.run_command('%s restart %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.fail_json(msg=out)
@@ -127,7 +127,7 @@ def main():
module.exit_json(changed=True)
module.run_command('%s start %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.fail_json(msg=out)
@@ -136,7 +136,7 @@ def main():
module.exit_json(changed=True)
module.run_command('%s monitor %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.fail_json(msg=out)