[checkmk-commits] EC: Status requests use precalculated header lists

Module: check_mk Branch: master Commit: 6e0b12c3118e9ab56aed03278ef8cb4719e638de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e0b12c3118e9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 29 13:42:35 2017 +0200 EC: Status requests use precalculated header lists Change-Id: I8a4157a4b8eea6aab10509026a82394f8369e18d --- bin/mkeventd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 2ec83db..ea812cf 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -795,7 +795,7 @@ def log_event_history_to_mongodb(event, what, who, addinfo): def get_event_history_from_mongodb(filters, limit): history_entries = [] - headers = [ c[0] for c in g_status_server.table_history.columns ] + headers = g_status_server.table_history.column_names if not g_mongo_conn: connect_mongodb() @@ -999,7 +999,7 @@ def get_event_history(filters, limit): def get_event_history_from_file(filters, limit): history_entries = [] - headers = [ c[0] for c in g_status_server.table_history.columns ] + headers = g_status_server.table_history.column_names log_dir = g_state_dir + "/history" if not os.path.exists(log_dir): return headers, [] @@ -3278,7 +3278,7 @@ class StatusTable(object): def __init__(self): super(StatusTable, self).__init__() - #self.column_names = [ c[0] for c in self.columns ] + self.column_names = [ c[0] for c in self.columns ] @@ -4220,11 +4220,11 @@ class EventStatus(object): result.append(event_line) - return [ e[0] for e in g_status_server.table_events.columns ], result + return g_status_server.table_events.column_names, result def get_rule_stats(self): - return [ e[0] for e in g_status_Server.table_rules.columns ], sorted(self._rule_stats.iteritems(), key=lambda x: x[0]) + return g_status_Server.table_rules.column_names, sorted(self._rule_stats.iteritems(), key=lambda x: x[0]) #. # .--Actions-------------------------------------------------------------.