[checkmk-commits] Analyze config: Fixed processing of remote site results

Module: check_mk Branch: master Commit: 931a380a6691d103d6022eeb96b0f76f97a58f7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=931a380a6691d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 09:00:13 2017 +0100 Analyze config: Fixed processing of remote site results Change-Id: I0154850dcec6d976795aaa6994bb953a442869c7 --- web/htdocs/wato.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 890ddf8..e165c27 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16581,7 +16581,7 @@ class ModeAnalyzeConfig(WatoMode): elif isinstance(results_data, list): test_results = [] for result_data in results_data: - result = watolib.ACResult.from_repr(ast.literal_eval(result_data)) + result = watolib.ACResult.from_repr(result_data) test_results.append(result) results_by_site[site_id] = test_results @@ -16603,8 +16603,7 @@ class ModeAnalyzeConfig(WatoMode): def _perform_tests_for_site(self, site_id, result_queue): try: if config.site_is_local(site_id): - results = watolib.check_analyze_config() - results_data = [ repr(result) for result in results ] + results_data = watolib.check_analyze_config() else: results_data = watolib.do_remote_automation( @@ -16615,6 +16614,9 @@ class ModeAnalyzeConfig(WatoMode): except Exception, e: log_exception() result_queue.put((site_id, e)) + finally: + result_queue.close() + result_queue.join_thread() def _filter_test_results(self, results_by_category):