[checkmk-commits] EC: Fixed possible exception when having none values in lq query responses

Module: check_mk Branch: master Commit: 50b43c9804ec54dcbd4b41916154239f05e83387 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50b43c9804ec54… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 13:37:32 2017 +0100 EC: Fixed possible exception when having none values in lq query responses Change-Id: Ie3d6f51c676d9c3daa610b402f7336998abce386 --- bin/mkeventd | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 40a364b..c3700d5 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -797,7 +797,7 @@ def quote_tab(col): elif type(col) == bool: return col and "1" or "0" elif type(col) in [ tuple, list ]: - col = "\1" + "\1".join(map(to_utf8, col)) + col = "\1" + "\1".join([ quote_tab(e) for e in col ]) elif col == None: col = "\2" @@ -3735,8 +3735,7 @@ class EventStatus(): # None found, create one event["count"] = 1 event["phase"] = "counting" - with lock_eventstatus: - self.new_event(event) + g_event_server.new_event_respecting_limits(event) def count_event(self, event, rule, count): @@ -3769,8 +3768,7 @@ class EventStatus(): else: event["count"] = 1 event["phase"] = "counting" - with lock_eventstatus: - self.new_event(event) + g_event_server.new_event_respecting_limits(event) found = event # Did we just count the event that was just one too much?