[checkmk-commits] Make all CMC helper only load the packed config

Module: check_mk Branch: master Commit: f5e46ce770d913323a159ce6da6f0c468606e881 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5e46ce770d913… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 18 12:57:48 2018 +0200 Make all CMC helper only load the packed config Previously the helpers initially loaded the whole Check_MK configuration and were later only reloading the helper specific packed config. The helpers should always only load load the precalculated helper config instead. Change-Id: I0331089e524934ffd2b883df29dfbed9811c89f3 --- cmk_base/modes/check_mk.py | 2 -- cmk_base/notify.py | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index d5078dd..4e499ee 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -1340,9 +1340,7 @@ modes.register(Mode( # '----------------------------------------------------------------------' def mode_notify(options, *args): - import cmk_base.config as config import cmk_base.notify as notify - config.load(with_conf_d=True, validate_hosts=False) return notify.do_notify(options, *args) modes.register(Mode( diff --git a/cmk_base/notify.py b/cmk_base/notify.py index cf1e6f4..6973c25 100644 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -169,6 +169,9 @@ def do_notify(options, args): if keepalive and "keepalive" in options: keepalive.enable() + config.load_packed_config() + else: + config.load(with_conf_d=True, validate_hosts=False) convert_legacy_configuration()