Module: check_mk
Branch: master
Commit: 3fbe5e78e91c9c2dab1cb4199cb0c153e1766394
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fbe5e78e91c9c…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Oct 14 08:55:03 2013 +0200
FIX: Fixed encoding problem in webservice column output
---
ChangeLog | 1 +
web/plugins/views/webservice.py | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bd166d5..4d82de5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
* Speed-O-Meter: now measure only service checks. Host checks
are omitted, since they do not really matter and make the
results less useful when using CMC.
+ * FIX: Fixed encoding problem in webservice column output
Checks & Agents:
* diskstat: removed (ever incorrect) latency computation for Linux
diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py
index a4e9561..f25e424 100644
--- a/web/plugins/views/webservice.py
+++ b/web/plugins/views/webservice.py
@@ -93,10 +93,13 @@ def render_json(rows, view, group_painters, painters, num_columns,
show_checkbox
else:
html.write(",")
tdclass, content = paint_painter(p[0], row)
- content = str(content).replace("<br>","\n")
+ if type(content) == unicode:
+ content = content.encode("utf-8")
+ else:
+ content = str(content)
+ content = content.replace("<br>","\n")
stripped = html.strip_tags(content)
- utf8 = stripped.encode("utf-8")
- html.write(encode_string_json(utf8))
+ html.write(encode_string_json(content))
html.write("]")
html.write("\n]\n")