[checkmk-commits] Win-agent: output IEventLogRecord with operator<<

Module: check_mk Branch: master Commit: 7fcdecf802800375211372134a6f900b72a4a3cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fcdecf8028003… Author: Jukka Aro &lt;ja(a)mathias-kettner.de&gt; Date: Tue Feb 27 16:10:56 2018 +0100 Win-agent: output IEventLogRecord with operator<< --- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 39 +++++++++++++++--------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 1409ef4..26770e3 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3132 +3134 diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 61722f2..e10bad2 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -58,21 +58,17 @@ std::pair<char, EventlogLevel> getEventState(const IEventLogRecord &event, } } -// The int return value is there just for convenience, actually we are not -// interested in the state int value at this point any more. -EventlogLevel outputEventlogRecord(std::ostream &out, - const IEventLogRecord &event, - EventlogLevel level, bool hide_context) { - char type_char{'\0'}; - EventlogLevel this_state{EventlogLevel::All}; - std::tie(type_char, this_state) = getEventState(event, level); - - if (hide_context && (type_char == '.')) { - return this_state; +inline bool isToBeOutput(char type_char, bool hide_context) { + if (!hide_context) { + return true; } + return type_char != '.'; +} + +std::ostream &operator<<(std::ostream &out, const IEventLogRecord &event) { // convert UNIX timestamp to local time - time_t time_generated = (time_t)event.timeGenerated(); + time_t time_generated = static_cast<time_t>(event.timeGenerated()); struct tm *t = localtime(&time_generated); char timestamp[64]; strftime(timestamp, sizeof(timestamp), "%b %d %H:%M:%S", t); @@ -81,11 +77,9 @@ EventlogLevel outputEventlogRecord(std::ostream &out, std::string source_name = to_utf8(event.source()); std::replace(source_name.begin(), source_name.end(), ' ', '_'); - out << type_char << " " << timestamp << " " << event.eventQualifiers() - << "." << event.eventId() << " " << source_name << " " - << Utf8(event.message()) << "\n"; - - return this_state; + return out << timestamp << " " << event.eventQualifiers() << "." + << event.eventId() << " " << source_name << " " + << Utf8(event.message()) << "\n"; } std::pair<uint64_t, EventlogLevel> processEventLog( @@ -240,9 +234,16 @@ uint64_t SectionEventlog::outputEventlog(std::ostream &out, IEventLog &log, if (worstState >= level) { const auto outputRecord = [&out, hideContext]( const IEventLogRecord &record, EventlogLevel level) { - return outputEventlogRecord(out, record, level, hideContext); + char type_char{'\0'}; + EventlogLevel dummy{EventlogLevel::Off}; + std::tie(type_char, dummy) = getEventState(record, level); + if (isToBeOutput(type_char, hideContext)) { + out << type_char << " " << record; + } + return dummy; // Dummy return value, ignored by caller }; - processEventLog(log, previouslyReadId, level, outputRecord); + std::tie(lastReadId, std::ignore) = + processEventLog(log, previouslyReadId, level, outputRecord); } // Return the last entry number. We need to fetch the last record ID // separately if INT_MAX was used as seek offset and no new entries