Module: check_mk
Branch: master
Commit: 65cd71df309830e3075bcae6777bafd08afce31a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65cd71df309830…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed Feb 1 10:29:58 2017 +0100
clang-formatted
Change-Id: Id2dce1f6448276f26d973c6f70d39c4b172d7489
---
agents/windows/EventLogVista.cc | 11 +++++------
agents/windows/SectionManager.cc | 1 -
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 1328640 -> 1328640 bytes
agents/windows/check_mk_agent-64.unstripped.exe | Bin 15652368 -> 15652368 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 1328640 -> 1328640 bytes
agents/windows/check_mk_agent.exe | Bin 1305088 -> 1305088 bytes
agents/windows/check_mk_agent.msi | Bin 2903552 -> 2903552 bytes
agents/windows/check_mk_agent.unstripped.exe | Bin 13543976 -> 13543976 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 1305088 -> 1305088 bytes
agents/windows/install_agent-64.exe | Bin 586639 -> 586638 bytes
agents/windows/install_agent.exe | Bin 583697 -> 583697 bytes
livestatus/src/TableEventConsoleRules.cc | 7 +++----
13 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/agents/windows/EventLogVista.cc b/agents/windows/EventLogVista.cc
index ca70aa2..1d21879 100644
--- a/agents/windows/EventLogVista.cc
+++ b/agents/windows/EventLogVista.cc
@@ -229,9 +229,7 @@ EventLogVista::EventLogVista(LPCWSTR path) : _path(path),
_handle(nullptr) {
reset();
}
-EventLogVista::~EventLogVista() noexcept {
- reset();
-}
+EventLogVista::~EventLogVista() noexcept { reset(); }
EvtFunctionMap &EventLogVista::evt() const { return *_evt; }
@@ -318,7 +316,8 @@ uint64_t EventLogVista::seek(uint64_t record_id) {
L"' IsCurrent='true'/></BookmarkList>";
std::unique_ptr<ManagedEventHandle> bookmark =
- std::make_unique<ManagedEventHandle>(*_evt,
evt().createBookmark(bookmarkXml.c_str()));
+ std::make_unique<ManagedEventHandle>(
+ *_evt, evt().createBookmark(bookmarkXml.c_str()));
_handle = std::make_unique<ManagedEventHandle>(
*_evt, evt().subscribe(nullptr, _signal->get_handle(), _path.c_str(),
@@ -340,8 +339,8 @@ std::shared_ptr<IEventLogRecord> EventLogVista::read() {
return std::shared_ptr<IEventLogRecord>();
}
}
- return std::make_shared<EventLogRecordVista>(_events[_next_event++],
- _evt.get(),
_render_context->get_handle());
+ return std::make_shared<EventLogRecordVista>(
+ _events[_next_event++], _evt.get(), _render_context->get_handle());
}
bool EventLogVista::fillBuffer() {
diff --git a/agents/windows/SectionManager.cc b/agents/windows/SectionManager.cc
index 2478b29..3643880 100644
--- a/agents/windows/SectionManager.cc
+++ b/agents/windows/SectionManager.cc
@@ -91,7 +91,6 @@ void SectionManager::loadStaticSections(Configuration &config,
->withBase(238)
->withRealtimeSupport());
-
addSection(new SectionEventlog(config));
addSection(new SectionLogwatch(config, env));
diff --git a/agents/windows/build_version b/agents/windows/build_version
index 324f7a3..5cf52bb 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-2518
+2520
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index 3dfb0ce..144e0f9 100755
Binary files a/agents/windows/check_mk_agent-64.exe and
b/agents/windows/check_mk_agent-64.exe differ
diff --git a/agents/windows/check_mk_agent-64.unstripped.exe
b/agents/windows/check_mk_agent-64.unstripped.exe
index a2032f4..40ec91b 100755
Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and
b/agents/windows/check_mk_agent-64.unstripped.exe differ
diff --git a/agents/windows/check_mk_agent-64.unversioned.exe
b/agents/windows/check_mk_agent-64.unversioned.exe
index 0025556..e433ce3 100755
Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and
b/agents/windows/check_mk_agent-64.unversioned.exe differ
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index d545f22..dbd5c70 100755
Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe
differ
diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi
index c04a63a..e6aad8c 100755
Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi
differ
diff --git a/agents/windows/check_mk_agent.unstripped.exe
b/agents/windows/check_mk_agent.unstripped.exe
index 805f0dd..ebf005c 100755
Binary files a/agents/windows/check_mk_agent.unstripped.exe and
b/agents/windows/check_mk_agent.unstripped.exe differ
diff --git a/agents/windows/check_mk_agent.unversioned.exe
b/agents/windows/check_mk_agent.unversioned.exe
index 42eff1c..74668ad 100755
Binary files a/agents/windows/check_mk_agent.unversioned.exe and
b/agents/windows/check_mk_agent.unversioned.exe differ
diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe
index 1bc1758..ad7f116 100755
Binary files a/agents/windows/install_agent-64.exe and
b/agents/windows/install_agent-64.exe differ
diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe
index f8b352f..b83676d 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ
diff --git a/livestatus/src/TableEventConsoleRules.cc
b/livestatus/src/TableEventConsoleRules.cc
index 9682652..cd1b197 100644
--- a/livestatus/src/TableEventConsoleRules.cc
+++ b/livestatus/src/TableEventConsoleRules.cc
@@ -31,12 +31,11 @@ using std::string;
TableEventConsoleRules::TableEventConsoleRules(MonitoringCore *mc)
: TableEventConsole(mc) {
- addColumn(make_unique<StringEventConsoleColumn>(
- "rule_id", "The ID of the rule"));
+ addColumn(
+ make_unique<StringEventConsoleColumn>("rule_id", "The ID of
the rule"));
addColumn(make_unique<IntEventConsoleColumn>(
- "rule_hits",
- "The times rule matched an incoming message"));
+ "rule_hits", "The times rule matched an incoming message"));
}
string TableEventConsoleRules::name() const { return "eventconsolerules"; }