Module: check_mk
Branch: master
Commit: 262e20fa27dcace841c76d2e1e880848c59ab80b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=262e20fa27dcac…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Oct 29 14:38:38 2013 +0100
Minor code cleanup
---
modules/check_mk.py | 17 +++++++++++++++++
modules/notify.py | 22 ++--------------------
web/plugins/wato/check_mk_configuration.py | 4 ++--
3 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 6c48f6b..b31222e 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -5015,6 +5015,23 @@ def ip_to_dnsname(ip):
except:
return None
+def config_timestamp():
+ mtime = 0
+ for dirpath, dirnames, filenames in os.walk(check_mk_configdir):
+ for f in filenames:
+ mtime = max(mtime, os.stat(dirpath + "/" + f).st_mtime)
+ mtime = max(mtime, os.stat(default_config_dir + "/main.mk").st_mtime)
+ try:
+ mtime = max(mtime, os.stat(default_config_dir + "/final.mk").st_mtime)
+ except:
+ pass
+ try:
+ mtime = max(mtime, os.stat(default_config_dir + "/local.mk").st_mtime)
+ except:
+ pass
+ return mtime
+
+
# Reset some global variable to their original value. This
# is needed in keepalive mode.
diff --git a/modules/notify.py b/modules/notify.py
index 5bc52c2..54c1775 100644
--- a/modules/notify.py
+++ b/modules/notify.py
@@ -327,26 +327,9 @@ def notify_data_available():
readable, writeable, exceptionable = select.select([0], [], [], None)
return not not readable
-def notify_config_timestamp():
- mtime = 0
- for dirpath, dirnames, filenames in os.walk(check_mk_configdir):
- for f in filenames:
- mtime = max(mtime, os.stat(dirpath + "/" + f).st_mtime)
- mtime = max(mtime, os.stat(default_config_dir + "/main.mk").st_mtime)
- try:
- mtime = max(mtime, os.stat(default_config_dir + "/final.mk").st_mtime)
- except:
- pass
- try:
- mtime = max(mtime, os.stat(default_config_dir + "/local.mk").st_mtime)
- except:
- pass
- return mtime
-
-
def notify_keepalive():
- config_timestamp = notify_config_timestamp()
+ last_config_timestamp = config_timestamp()
# Send signal that we are ready to receive the next notification, but
# not after a config-reload-restart (see below)
@@ -369,8 +352,7 @@ def notify_keepalive():
# CMK_NOTIFY_RESTART=1
if notify_data_available():
- current_config_timestamp = notify_config_timestamp()
- if current_config_timestamp > config_timestamp:
+ if last_config_timestamp != config_timestamp():
notify_log("Configuration has changed. Restarting
myself.")
os.putenv("CMK_NOTIFY_RESTART", "1")
os.execvp("cmk", sys.argv)
diff --git a/web/plugins/wato/check_mk_configuration.py
b/web/plugins/wato/check_mk_configuration.py
index d1ea01e..aed889a 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -1388,8 +1388,8 @@ register_rule(group,
title = _("Enable/disable passive checks for services"),
help = _("This setting allows you to disable the processing of passiv check
results for a "
"service."),
- choices = [ ("1", _("Enable processing of passiv check
results")),
- ("0", _("Disable processing of passiv check
results")) ],
+ choices = [ ("1", _("Enable processing of passive check
results")),
+ ("0", _("Disable processing of passive check
results")) ],
),
itemtype = "service")