Module: check_mk Branch: master Commit: e02b2ea2fad77d62068332db33f1c8231bce1f67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e02b2ea2fad77d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 23 16:36:47 2016 +0100 4068 FIX Fixed possible exception in case of wrong automation secrets between multiple sites When having a distributed WATO setup and a site secret is changed, the error message could not be displayed correctly when using a localized GUI. --- .werks/4068 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/index.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4068 b/.werks/4068 new file mode 100644 index 0000000..83bd585 --- /dev/null +++ b/.werks/4068 @@ -0,0 +1,11 @@ +Title: Fixed possible exception in case of wrong automation secrets between multiple sites +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1479915339 + +When having a distributed WATO setup and a site secret is changed, the error message +could not be displayed correctly when using a localized GUI. diff --git a/ChangeLog b/ChangeLog index 5258b68..a186e1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 3977 FIX: Fixed poping up changes button in sidebar snapin after a change * 3982 FIX: Some MKPs created with WATO could not be uploaded to the Check_MK Exchange * 4045 FIX: Tactical Overview: do not count OK events as problems + * 4068 FIX: Fixed possible exception in case of wrong automation secrets between multiple sites... Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 5d2240f..012b67c 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -70,7 +70,7 @@ def handler(mod_python_req, fields = None, is_profiling = False): try: handler() except Exception, e: - html.write(str(e)) + html.write("%s" % e) if config.debug: html.write(html.attrencode(traceback.format_exc())) raise FinalizeRequest()