[checkmk-commits] GUI: Cleaned up finalization code a bit

Module: check_mk Branch: master Commit: 067b7ab5bff8bc865b9a3715bb32f3d1f1792a13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=067b7ab5bff8bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 10:58:52 2017 +0100 GUI: Cleaned up finalization code a bit Change-Id: I29bd9b8f752d2db9e7d63c2ea1da8f366138385e --- web/htdocs/html_mod_python.py | 2 +- web/htdocs/index.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 49eff00..074c80d 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -160,7 +160,7 @@ class html_mod_python(htmllib.html): # Finish the HTTP request short before handing over to mod_python - def finalize(self, is_error=False): + def finalize(self): self.disable_request_timeout() #self.finalize_guitests() diff --git a/web/htdocs/index.py b/web/htdocs/index.py index f6654a4..8c9f7f4 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -135,7 +135,6 @@ def handler(mod_python_req, fields = None, is_profiling = False): except (apache.SERVER_RETURN, (apache.SERVER_RETURN, apache.HTTP_UNAUTHORIZED), (apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY)): - finalize_request(is_error=True) raise except Exception, e: @@ -147,7 +146,9 @@ def handler(mod_python_req, fields = None, is_profiling = False): modules.get_handler("gui_crash")() response_code = apache.OK - finalize_request() + finally: + finalize_request() + return response_code @@ -194,11 +195,10 @@ def ensure_general_access(): raise MKAuthException(" ".join(reason)) -def finalize_request(is_error=False): +def finalize_request(): release_all_locks() userdb.finalize() sites.disconnect() - html.finalize(is_error=is_error) # Ajax-Functions want no HTML output in case of an error but