[checkmk-commits] Check_MK Git: check_mk: #1861 FIX exception in mkeventd when archiving certain event log lines

Module: check_mk Branch: master Commit: eca3720635e06d94d27f57ca903a07a99756448b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca3720635e06d… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Feb 12 15:41:09 2015 +0100 #1861 FIX exception in mkeventd when archiving certain event log lines --- .werks/1861 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1861 b/.werks/1861 new file mode 100644 index 0000000..9268e4e --- /dev/null +++ b/.werks/1861 @@ -0,0 +1,9 @@ +Title: exception in mkeventd when archiving certain event log lines +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423751976 + diff --git a/ChangeLog b/ChangeLog index 81d6f85..d9a9c46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -242,6 +242,7 @@ * 1839 FIX: Fix exception when notifying EC alert into monitoring for traps (because PID is missing) * 1813 FIX: Fixed bug in event console rule editor when no contact groups configured * 1974 FIX: Event console views were randomly ignoring host filters... + * 1861 FIX: exception in mkeventd when archiving certain event log lines HW/SW-Inventory: * 1846 Keep track of changes of software and hardware... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 4fb1755..f9257e7 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -681,7 +681,7 @@ def quote_tab(col): if type(col) in [ float, int ]: return str(col) elif type(col) in [ tuple, list ]: - col = "\1" + "\1".join(col) + col = "\1" + "\1".join(map(str, col)) elif col == None: col = "\2"