[checkmk-commits] Check_MK Git: check_mk: Avoid duplicate verification of monitoring config on cmk -R/-O

Module: check_mk Branch: master Commit: 3c55b0f794ad779d5f7e8734c2d316c3c0acc131 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c55b0f794ad77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 19 18:01:40 2012 +0100 Avoid duplicate verification of monitoring config on cmk -R/-O --- ChangeLog | 2 ++ modules/check_mk.py | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ec8b7a..c447731 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ * Added HOSTTAGS to notification macros which contains all Check_MK-Tags separated by spaces * Output better error message in case of old inventory function + * Do object cache precompile for monitoring core on cmk -R/-O + * Avoid duplicate verification of monitoring config on cmk -R/-O Notifications: * Fix flexible notifications on non-OMD systems diff --git a/modules/check_mk.py b/modules/check_mk.py index 4429a6c..f79f889 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3919,7 +3919,7 @@ def do_update(): def do_check_nagiosconfig(): - command = nagios_binary + " -v " + nagios_config_file + " 2>&1" + command = nagios_binary + " -vp " + nagios_config_file + " 2>&1" sys.stdout.write("Validating Nagios configuration...") if opt_verbose: sys.stderr.write("Running '%s'" % command) @@ -3941,10 +3941,8 @@ def do_restart_nagios(only_reload): action = only_reload and "load" or "start" sys.stdout.write("Re%sing Nagios..." % action) sys.stdout.flush() - if omd_root: - command = "omd re%s core 2>&1" % action - else: - command = nagios_startscript + " re%s 2>&1" % action + os.putenv("CORE_NOVERIFY", "yes") + command = nagios_startscript + " re%s 2>&1" % action process = os.popen(command, "r") output = process.read()