Module: check_mk
Branch: master
Commit: 164e9e48f62a1dadb306d9a2d17640dedcf7989a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=164e9e48f62a1d…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Jun 7 10:32:45 2018 +0200
Fix dependencies of core-related modules, part 3.
Nuked _cmc_relfile global variable. The price we have to pay for this
currently is the fact that we have to repeat the default filename for the
CMC config. But: We are already doing this in several places, so we have to
clean this up, anyway.
Change-Id: I49b5854231497a75a01f721ee8b9e44d659b10e8
---
cmk_base/core.py | 2 +-
cmk_base/core_config.py | 24 +++++++++---------------
cmk_base/modes/check_mk.py | 10 ++++------
3 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/cmk_base/core.py b/cmk_base/core.py
index a0ebdc4..1e8c225 100644
--- a/cmk_base/core.py
+++ b/cmk_base/core.py
@@ -88,7 +88,7 @@ def do_restart(only_reload = False):
backup_path = None
try:
- core_config.do_create_config(with_agents=True)
+ core_config.do_create_config(with_agents=True, cmc_file="config")
except Exception, e:
# TODO: Replace by MKBailOut()/MKTerminate()?
console.error("Error creating configuration: %s\n" % e)
diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py
index 65b8432..d23e371 100644
--- a/cmk_base/core_config.py
+++ b/cmk_base/core_config.py
@@ -40,7 +40,6 @@ import cmk_base.checks as checks
import cmk_base.rulesets as rulesets
import cmk_base.ip_lookup as ip_lookup
-_cmc_relfilename = "config"
_ignore_ip_lookup_failures = False
_failed_ip_lookups = []
@@ -218,16 +217,11 @@ def check_icmp_arguments_of(hostname, add_defaults=True,
family=None):
# | Code for managing the core configuration creation. |
# '----------------------------------------------------------------------'
-def set_cmc_relfilename(name):
- global _cmc_relfilename
- _cmc_relfilename = name
-
-
# TODO: Move to modes?
-def do_create_config(with_agents=True):
+def do_create_config(with_agents, cmc_file):
console.output("Generating configuration for core (type %s)..." %
config.monitoring_core)
- create_core_config()
+ create_core_config(cmc_file)
console.output(tty.ok + "\n")
if with_agents:
@@ -238,21 +232,21 @@ def do_create_config(with_agents=True):
pass
-def create_core_config():
+def create_core_config(cmc_file="config"):
initialize_warnings()
_verify_non_duplicate_hosts()
_verify_non_deprecated_checkgroups()
- _create_config()
+ _create_config(cmc_file)
cmk.password_store.save(config.stored_passwords)
return get_configuration_warnings()
-def _create_config():
+def _create_config(cmc_file):
if config.monitoring_core == "cmc":
- import cmk_base.cee.core_cmc as core_cmc
- core_cmc.create_config(_cmc_relfilename)
+ from cmk_base.cee.core_cmc import create_config_hook
+ create_config_hook(cmc_file)
else:
from cmk_base.core_nagios import create_config_hook
create_config_hook()
@@ -289,9 +283,9 @@ def precompile():
precompile_hook()
-def do_update(with_precompile):
+def do_update(with_precompile, cmc_file):
try:
- do_create_config(with_agents=with_precompile)
+ do_create_config(with_agents=with_precompile, cmc_file=cmc_file)
if with_precompile:
precompile()
diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py
index 6fb89bb..d457409 100644
--- a/cmk_base/modes/check_mk.py
+++ b/cmk_base/modes/check_mk.py
@@ -1014,9 +1014,8 @@ def _cmc_file(options):
def mode_update_no_precompile(options):
- import cmk_base.core_config
- cmk_base.core_config.set_cmc_relfilename(_cmc_file(options))
- cmk_base.core_config.do_update(with_precompile=False)
+ from cmk_base.core_config import do_update
+ do_update(with_precompile=False, cmc_file=_cmc_file(options))
modes.register(Mode(
long_option="update-no-precompile",
@@ -1072,9 +1071,8 @@ modes.register(Mode(
# '----------------------------------------------------------------------'
def mode_update(options):
- import cmk_base.core_config
- cmk_base.core_config.set_cmc_relfilename(_cmc_file(options))
- cmk_base.core_config.do_update(with_precompile=True)
+ from cmk_base.core_config import do_update
+ do_update(with_precompile=True, cmc_file=_cmc_file(options))
modes.register(Mode(
long_option="update",