Module: check_mk
Branch: master
Commit: 5a7f391e306f6135f1eabbcab03226744aa9f4bb
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a7f391e306f61…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Feb 14 11:42:27 2013 +0100
mkeventd: Easier debugging of script actions
---
mkeventd/bin/mkeventd | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd
index 6d4f314..ff872ac 100755
--- a/mkeventd/bin/mkeventd
+++ b/mkeventd/bin/mkeventd
@@ -2327,7 +2327,19 @@ def send_email(to, subject, body):
os.popen("mail -s '%s' '%s'" % (shell_escape(subject),
shell_escape(to)), "w").write(body)
def execute_script(body):
- os.popen("/bin/bash", "w").write(body.encode('utf-8'))
+ p = subprocess.Popen(
+ body.encode('utf-8'),
+ shell = True,
+ executable = '/bin/bash',
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+ )
+ output = p.stdout.read()
+ exitcode = p.wait()
+
+ if g_config["debug_rules"]:
+ if output:
+ log(' Output: %s' % output)
+ log(' Exitcode: %d' % exitcode)
#.