[checkmk-commits] Check_MK Git: check_mk: FIX: Fixed multisite timeout errors when nagios not running

Module: check_mk Branch: master Commit: bf2c7dde53d3f4e354db4ae9faef24fd9ad86161 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf2c7dde53d3f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 10 12:06:37 2012 +0200 FIX: Fixed multisite timeout errors when nagios not running --- ChangeLog | 1 + web/htdocs/index.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e38edc1..72e121f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * New configuration parameter page_heading for the HTML page heads of the main frameset (%s will be replaced with OMD site name) * FIX: Fix problem where snapins where invisible + * FIX: Fixed multisite timeout errors when nagios not running BI * FIX: Fixed filtering of Single-Host Aggregations diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 3c75de6..ac1ecd5 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -357,7 +357,8 @@ def handler(req, profiling = True): html.header(_("Livestatus problem")) html.show_error(_("Livestatus problem: %s") % e) html.footer() - response_code = apache.HTTP_INTERNAL_SERVER_ERROR + else: + response_code = apache.HTTP_BAD_GATEWAY except apache.SERVER_RETURN: raise