[checkmk-commits] Check_MK Git: check_mk: FIX: webservice: suppress livestatus errors in multi-site setups

Module: check_mk Branch: master Commit: 8c919e9b7fa190e45f24d894f9615110b2513eb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c919e9b7fa190… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed Apr 20 16:10:32 2011 +0200 FIX: webservice: suppress livestatus errors in multi-site setups --- ChangeLog | 1 + web/htdocs/views.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6dbf430..b765fdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * --debug now implies -v Multisite: + * FIX: webservice: suppress livestatus errors in multi-site setups * FIX: install missing example icons in web/htdocs/images/icons * FIX: Nagios-Snapin: avoid duplicate slash in URL * FIX: custom_style_sheet now also honored by sidebar diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 53458fd..27dbd14 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1189,8 +1189,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru play_alarm_sounds() # In multi site setups error messages of single sites do not block the - # output and raise now exception. We simply print error messages here: - if config.show_livestatus_errors: + # output and raise now exception. We simply print error messages here. + # In case of the web service we show errors only on single site installations. + if config.show_livestatus_errors and (html.output_format == "html" or not config.is_multisite()): for sitename, info in html.live.deadsites.items(): html.show_error("<b>%s - Livestatus error</b><br>%s" % (info["site"]["alias"], info["exception"]))