Module: check_mk
Branch: master
Commit: c86264ab1e370a0ebaa8a1bd42eb67cacb75bac2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c86264ab1e370a…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Sep 26 14:03:18 2016 +0200
clang-formatted
---
agents/windows/ExternalCmd.cc | 3 ---
livestatus/src/TableEventConsoleStatus.cc | 25 +++++++++++++------------
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/agents/windows/ExternalCmd.cc b/agents/windows/ExternalCmd.cc
index 78dbb09..8287536 100644
--- a/agents/windows/ExternalCmd.cc
+++ b/agents/windows/ExternalCmd.cc
@@ -48,7 +48,6 @@ ExternalCmd::ExternalCmd(const char *cmdline) {
// child process needs to be able to inherit the pipe handles
security_attributes.bInheritHandle = true;
-
if (!CreatePipe(&_stdout, &_script_stdout, &security_attributes, 0)) {
throw win_exception("failed to create pipe");
}
@@ -69,7 +68,6 @@ ExternalCmd::ExternalCmd(const char *cmdline) {
si.hStdOutput = _script_stdout;
si.hStdError = with_stderr ? _script_stdout : _script_stderr;
-
PROCESS_INFORMATION pi;
ZeroMemory(&pi, sizeof(PROCESS_INFORMATION));
std::unique_ptr<char[], decltype(free) *> cmdline_buf(strdup(cmdline),
@@ -110,7 +108,6 @@ void ExternalCmd::closeScriptHandles() {
::CloseHandle(_script_stdout);
}
-
DWORD ExternalCmd::exitCode() {
DWORD res;
GetExitCodeProcess(_process, &res);
diff --git a/livestatus/src/TableEventConsoleStatus.cc
b/livestatus/src/TableEventConsoleStatus.cc
index 5f26b80..fa48bcb 100644
--- a/livestatus/src/TableEventConsoleStatus.cc
+++ b/livestatus/src/TableEventConsoleStatus.cc
@@ -36,20 +36,19 @@ TableEventConsoleStatus::TableEventConsoleStatus()
addColumn(new IntEventConsoleColumn(
"status_config_load_time",
"The time when the Event Console config was loaded"));
- addColumn(new IntEventConsoleColumn(
- "status_num_open_events",
- "The number of currently open events"));
- addColumn(new IntEventConsoleColumn(
- "status_virtual_memory_size",
- "The current virtual memory size in bytes"));
+ addColumn(new IntEventConsoleColumn("status_num_open_events",
+ "The number of currently open
events"));
+ addColumn(
+ new IntEventConsoleColumn("status_virtual_memory_size",
+ "The current virtual memory size in
bytes"));
addColumn(new IntEventConsoleColumn(
"status_messages",
"The number of messages received since startup of the Event
Console"));
addColumn(new DoubleEventConsoleColumn("status_message_rate",
"The incoming message rate"));
- addColumn(new DoubleEventConsoleColumn("status_average_message_rate",
- "The average incoming message
rate"));
+ addColumn(new DoubleEventConsoleColumn(
+ "status_average_message_rate", "The average incoming message
rate"));
addColumn(
new IntEventConsoleColumn("status_connects", "The number of
connects"));
addColumn(new DoubleEventConsoleColumn("status_connect_rate",
@@ -86,10 +85,12 @@ TableEventConsoleStatus::TableEventConsoleStatus()
addColumn(new DoubleEventConsoleColumn("status_average_rule_hit_rate",
"The average rule hit rate"));
- addColumn(new DoubleEventConsoleColumn("status_average_processing_time",
- "The average incoming message processing
time"));
- addColumn(new DoubleEventConsoleColumn("status_average_request_time",
- "The average status client request
time"));
+ addColumn(new DoubleEventConsoleColumn(
+ "status_average_processing_time",
+ "The average incoming message processing time"));
+ addColumn(
+ new DoubleEventConsoleColumn("status_average_request_time",
+ "The average status client request
time"));
addColumn(new DoubleEventConsoleColumn("status_average_sync_time",
"The average sync time"));
addColumn(new StringEventConsoleColumn(