[checkmk-commits] Check_MK Git: check_mk: #1613 FIX Fixed invalid json format in Stats query with requested heaeders

Module: check_mk Branch: master Commit: 74d8f5c5c2e22b4f39062ff32765342ceba65205 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74d8f5c5c2e22b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 17:52:57 2014 +0100 #1613 FIX Fixed invalid json format in Stats query with requested heaeders The "," after header line was missing --- .werks/1613 | 9 +++++++++ ChangeLog | 3 +++ livestatus/src/Query.cc | 5 +++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/1613 b/.werks/1613 new file mode 100644 index 0000000..51ba9bf --- /dev/null +++ b/.werks/1613 @@ -0,0 +1,9 @@ +Title: Fixed invalid json format in Stats query with requested heaeders +Level: 1 +Component: livestatus +Compatible: compat +Version: 1.2.5i7 +Date: 1417625520 +Class: fix + +The "," after header line was missing diff --git a/ChangeLog b/ChangeLog index 43586c5..c5a3bb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -160,6 +160,9 @@ * 1531 FIX: Fixed exception in event history view when displaying CHANGESTATE events * 1610 FIX: Hostname translation now also works for incoming SNMP traps + Livestatus: + * 1613 FIX: Fixed invalid json format in Stats query with requested heaeders... + HW/SW-Inventory: * 1479 liveproxyd: new function for collecting remote inventory data... NOTE: Please refer to the migration notes! diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 448d4ab..27a3f7d 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -912,9 +912,10 @@ void Query::finish() it != _stats_groups.end(); ++it) { - // dataset separator after first group - if (it != _stats_groups.begin() && _output_format != OUTPUT_FORMAT_CSV) + if (_need_ds_separator && _output_format != OUTPUT_FORMAT_CSV) _output->addBuffer(",\n", 2); + else + _need_ds_separator = true; outputDatasetBegin();