[checkmk-commits] Refactoring: rename cmk_section_dict cmk_info, use string keys instead of unicode

Module: check_mk Branch: master Commit: 1375abe122e51613664351e3f02adbd8397aaf87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1375abe122e516… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jun 12 10:56:07 2017 +0200 Refactoring: rename cmk_section_dict cmk_info, use string keys instead of unicode Change-Id: If775f1479146d3d4f99c0b38c73b4adc838c93e4 --- modules/check_mk_base.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index b897813..0e1705b 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1211,10 +1211,10 @@ def do_check(hostname, ipaddress, only_check_types = None): try: load_item_state(hostname) - cmk_section_dict, num_success, error_sections, problems = \ + cmk_info, num_success, error_sections, problems = \ do_all_checks_on_host(hostname, ipaddress, only_check_types) - agent_version = cmk_section_dict[u"version"] + agent_version = cmk_info["version"] num_errors = len(error_sections) save_item_state(hostname) @@ -1505,24 +1505,24 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None, fetch_ag submit_aggregated_results(hostname) if fetch_agent_version: - cmk_section_dict = { u"version" : "(unknown)" } + cmk_info = { "version" : "(unknown)" } try: if is_tcp_host(hostname): for line in get_info_for_check(hostname, ipaddress, 'check_mk'): value = " ".join(line[1:]) if len(line) > 1 else None - cmk_section_dict[line[0][:-1].lower()] = value + cmk_info[str(line[0][:-1].lower())] = value else: - cmk_section_dict[u"version"] = None + cmk_info["version"] = None except MKAgentError: g_broken_agent_hosts.add(hostname) except: pass else: - cmk_section_dict[u"version"] = None + cmk_info["version"] = None error_section_list = sorted(list(error_sections)) - return cmk_section_dict, num_success, error_section_list, ", ".join(problems) + return cmk_info, num_success, error_section_list, ", ".join(problems) # Create a crash dump with a backtrace and the agent output.