[checkmk-commits] Log filters in a more compact form.

Module: check_mk Branch: master Commit: 163919743dcb72cb828ab00592c98d3c0e0286d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=163919743dcb72… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Tue Mar 20 16:49:55 2018 +0100 Log filters in a more compact form. Change-Id: I1acaac48f7281345f954456e15805fa2b082fc94 --- livestatus/src/AndingFilter.cc | 4 ++-- livestatus/src/ColumnFilter.cc | 3 +-- livestatus/src/OringFilter.cc | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index 876020e..2b7726b 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -149,7 +149,7 @@ Filters AndingFilter::conjuncts() const { std::ostream &AndingFilter::print(std::ostream &os) const { for (const auto &filter : _subfilters) { - os << *filter; + os << *filter << "\\n"; } switch (kind()) { case Kind::row: @@ -162,5 +162,5 @@ std::ostream &AndingFilter::print(std::ostream &os) const { os << "WaitConditionAnd"; break; } - return os << ": " << _subfilters.size() << "\n"; + return os << ": " << _subfilters.size(); } diff --git a/livestatus/src/ColumnFilter.cc b/livestatus/src/ColumnFilter.cc index 22dbcac..858464f 100644 --- a/livestatus/src/ColumnFilter.cc +++ b/livestatus/src/ColumnFilter.cc @@ -47,6 +47,5 @@ Filters ColumnFilter::conjuncts() const { } std::ostream &ColumnFilter::print(std::ostream &os) const { - return os << "Filter: " << columnName() << " " << oper() << " " << value() - << "\n"; + return os << "Filter: " << columnName() << " " << oper() << " " << value(); } diff --git a/livestatus/src/OringFilter.cc b/livestatus/src/OringFilter.cc index b731a94..492a48d 100644 --- a/livestatus/src/OringFilter.cc +++ b/livestatus/src/OringFilter.cc @@ -156,7 +156,7 @@ Filters OringFilter::conjuncts() const { std::ostream &OringFilter::print(std::ostream &os) const { for (const auto &filter : _subfilters) { - os << *filter; + os << *filter << "\\n"; } switch (kind()) { case Kind::row: @@ -169,5 +169,5 @@ std::ostream &OringFilter::print(std::ostream &os) const { os << "WaitConditionOr"; break; } - return os << ": " << _subfilters.size() << "\n"; + return os << ": " << _subfilters.size(); }