Module: check_mk
Branch: master
Commit: b27a278d1aa13cdfdc812b00b1d80d5a024f2b56
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b27a278d1aa13c…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Jun 7 10:56:58 2018 +0200
Fix dependencies of core-related modules, part 4.
Unified the interfaces for config generation. The price for now is a
slightly ugly interface (the Nagios implementation receives an argument it
doesn't care about), but this will improve when we have real classes instead
of abused modules.
Change-Id: Ic457a39e28bc3abc67b2363ebd7c2c61d0da15db
---
cmk_base/core_config.py | 3 +--
cmk_base/core_nagios.py | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py
index d23e371..f71e7ff 100644
--- a/cmk_base/core_config.py
+++ b/cmk_base/core_config.py
@@ -246,10 +246,9 @@ def create_core_config(cmc_file="config"):
def _create_config(cmc_file):
if config.monitoring_core == "cmc":
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()
+ create_config_hook(cmc_file)
# Verify that the user has no deprecated check groups configured.
diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py
index 8f58446..0261f1b 100644
--- a/cmk_base/core_nagios.py
+++ b/cmk_base/core_nagios.py
@@ -57,7 +57,7 @@ import cmk_base.check_utils
# | Create a configuration file for Nagios core with hosts + services |
# '----------------------------------------------------------------------'
-def create_config_hook():
+def create_config_hook(_cmc_file):
with file(cmk.paths.nagios_objects_file, "w") as out:
create_config(out, None)