[checkmk-commits] Check_MK Git: check_mk: FIX Allow non-Ascii characters in generated events

Module: check_mk Branch: master Commit: 3c89d6f28e2b79781a0c4da159ff48252e7f0c5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c89d6f28e2b79… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri Jan 24 10:52:21 2014 +0100 FIX Allow non-Ascii characters in generated events --- .werks/679 | 9 +++++++++ ChangeLog | 1 + mkeventd/web/htdocs/mkeventd.py | 2 ++ 3 files changed, 12 insertions(+) diff --git a/.werks/679 b/.werks/679 new file mode 100644 index 0000000..407730a --- /dev/null +++ b/.werks/679 @@ -0,0 +1,9 @@ +Title: Allow non-Ascii characters in generated events +Level: 1 +Component: ec +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390557118 + + diff --git a/ChangeLog b/ChangeLog index f5d3076..4e991f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -241,6 +241,7 @@ * 0359 FIX: Fixed exception in event simulator when one match group did not match * 0384 FIX: Trying to prevent problem when restarting mkeventd... * 0427 FIX: Fixed exception when handling connections from event unix socket... + * 0679 FIX: Allow non-Ascii characters in generated events Livestatus: * 0337 New header for limiting the execution time of a query... diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index ebd3df9..e82258d 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -146,6 +146,8 @@ def send_event(event): timestamp = time.strftime("%b %d %T", time.localtime()) rfc = "<%d>%s %s %s: %s\n" % ( prio, timestamp, event["host"], event["application"], event["text"]) + if type(rfc) == unicode: + rfc = rfc.encode("utf-8") pipe = file(pipe_path, "w") pipe.write(rfc + "\n") return rfc