[checkmk-commits] Check_MK Git: check_mk: FIX: fix invalid request in livestatus query after reconnect

Module: check_mk Branch: master Commit: 841d4b05e1540975850a7905d3786d53f370b26d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=841d4b05e15409… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 4 16:53:13 2013 +0200 FIX: fix invalid request in livestatus query after reconnect --- ChangeLog | 1 + web/htdocs/livestatus.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1daa238..2c27ccc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -185,6 +185,7 @@ Multisite: * List of views: Output the alias of a datasource instead of internal name * FIX: fix column editor for join columns if "SERVICE:" is l10n'ed + * FIX: fix invalid request in livestatus query after reconnect WATO: * FIX: convert editing of global setting to POST. This avoid URL-too-long diff --git a/web/htdocs/livestatus.py b/web/htdocs/livestatus.py index bff1cfd..640835a 100644 --- a/web/htdocs/livestatus.py +++ b/web/htdocs/livestatus.py @@ -261,6 +261,7 @@ class BaseConnection: return self.recv_response(query, add_headers) def send_query(self, query, add_headers = "", do_reconnect=True): + orig_query = query if self.socket == None: self.connect() if not query.endswith("\n"): @@ -288,7 +289,7 @@ class BaseConnection: # Automatically try to reconnect in case of an error, but # only once. self.connect() - self.send_query(query, add_headers, False) + self.send_query(orig_query, add_headers, False) return raise MKLivestatusSocketError("RC1:" + str(e))