[checkmk-commits] 7227 FIX Fixed liveproxy activating errors confusing site related web API calls

Module: check_mk Branch: master Commit: b3af9ec7ba234b1bf39ed088ee7af23f3cc0cd30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3af9ec7ba234b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 5 12:51:26 2019 +0100 7227 FIX Fixed liveproxy activating errors confusing site related web API calls Unclean error handling could make site management related web API calls like set_all_sites fail because an ASCII error message was sent back as result to the API call instead of the expected JSON data structure. Change-Id: I3a14c36b0e495578eb8be701c05e242b586fd377 --- .werks/7227 | 12 ++++++++++++ cmk/gui/watolib/config_domains.py | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/7227 b/.werks/7227 new file mode 100644 index 0000000..d43cfb9 --- /dev/null +++ b/.werks/7227 @@ -0,0 +1,12 @@ +Title: Fixed liveproxy activating errors confusing site related web API calls +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551786567 +Class: fix + +Unclean error handling could make site management related web API calls like set_all_sites +fail because an ASCII error message was sent back as result to the API call instead of +the expected JSON data structure. diff --git a/cmk/gui/watolib/config_domains.py b/cmk/gui/watolib/config_domains.py index 30b9334..8f2db16 100644 --- a/cmk/gui/watolib/config_domains.py +++ b/cmk/gui/watolib/config_domains.py @@ -129,8 +129,8 @@ class ConfigDomainLiveproxy(ConfigDomain): raise except Exception as e: logger.exception() - html.show_warning( - _("Could not reload Livestatus Proxy: %s. See web.log " + raise MKGeneralException( + _("Could not reload Livestatus Proxy: %s. See web.log and liveproxyd.log " "for further information.") % e) # TODO: Move default values to common module to share