[checkmk-commits] Check_MK Git: check_mk: Fixed error in non omd environments with local special agents directory

Module: check_mk Branch: master Commit: d8f6cadf091c7e975c211394e8ac2f23fd154cdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8f6cadf091c7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 20 09:18:55 2013 +0200 Fixed error in non omd environments with local special agents directory --- modules/check_mk.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 83d4571..cce4568 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1107,7 +1107,8 @@ def get_sorted_check_table(hostname): # be None in most cases -> to TCP connect on port 6556 # HACK: special_agent_dir = agents_dir + "/special" -special_agent_local_dir = local_agents_dir + "/special" +if local_agents_dir: + special_agent_local_dir = local_agents_dir + "/special" def get_datasource_program(hostname, ipaddress): # First check WATO-style special_agent rules @@ -1116,7 +1117,7 @@ def get_datasource_program(hostname, ipaddress): if params: # rule match! # Create command line using the special_agent_info cmd_arguments = special_agent_info[agentname](params[0], hostname, ipaddress) - if special_agent_local_dir and \ + if local_agents_dir and \ os.path.exists(special_agent_local_dir + "/agent_" + agentname): path = special_agent_local_dir + "/agent_" + agentname else: