[checkmk-commits] Check_MK Git: check_mk: Fixed function name conflict

Module: check_mk Branch: master Commit: c1dfa988fb98b25c6ae41bd9c1bf87811d35ff04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1dfa988fb98b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 22 17:39:07 2014 +0200 Fixed function name conflict --- modules/automation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 4244828..baa99cc 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1329,7 +1329,7 @@ def automation_active_check(args): return execute_check_plugin(command_line) -def load_resource_cfg(macros): +def load_resource_file(macros): try: for line in file(omd_root + "/etc/nagios/resource.cfg"): line = line.strip() @@ -1351,7 +1351,7 @@ def replace_core_macros(hostname, commandline): "$HOSTNAME$" : hostname, "$HOSTADDRESS$" : lookup_ipaddress(hostname), } - load_resource_cfg(macros) + load_resource_file(macros) for varname, value in macros.items(): commandline = commandline.replace(varname, value) return commandline