Checkmk git commits December 2017

checkmk-commits@lists.checkmk.com

10 participants
219 discussions

Revert "5526 FIX check_dns: Do not pass off the host' s IP address as a default DNS server address"

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0b8f441a6072de76bfa4ed91f6082a3ab4667829 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b8f441a6072de… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Dec 29 14:45:02 2017 +0100 Revert "5526 FIX check_dns: Do not pass off the host's IP address as a default DNS server address" This reverts commit 59499b860504229fd3528712134823a92bc2d46a. Change-Id: I0e8ea19a140b4bcae7a99cb2e9aae2567247868b --- checks/check_dns | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/check_dns b/checks/check_dns index 2f5bbd2..743636f 100644 --- a/checks/check_dns +++ b/checks/check_dns @@ -31,6 +31,8 @@ def check_dns_arguments(params): if "server" in settings: if settings["server"] != None: args += ' -s %s' % quote_shell_string(settings["server"]) + else: + args += " -s '$HOSTADDRESS$'" if "expected_address" in settings: # Convert from old (str) to new (list of strings)

6 years, 5 months

5599 FIX check_dns: Return to the behaviour prior to Werk #5526

by Konstantin Büttner

Module: check_mk Branch: master Commit: dbd5370e9694c5c9b74a9cb3e4c88cc7e794d777 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbd5370e9694c5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Dec 29 14:49:36 2017 +0100 5599 FIX check_dns: Return to the behaviour prior to Werk #5526 Although Werk #5526 brought the behaviour in line with what's described in the GUI, this kind of change requires further discussion as to what the desired behaviour is. We return to the old behaviour and adjust the GUIs description Change-Id: I21d290ba63878d2a736fd6468c006bfc5188873c --- .werks/5599 | 12 ++++++++++++ web/plugins/wato/active_checks.py | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/5599 b/.werks/5599 new file mode 100644 index 0000000..c73b42e --- /dev/null +++ b/.werks/5599 @@ -0,0 +1,12 @@ +Title: check_dns: Return to the behaviour prior to Werk #5526 +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.4.0p23 +Date: 1514555220 +Class: fix + +Although Werk #5526 brought the behaviour in line with what's described in the GUI, +this kind of change requires further discussion as to what the desired behaviour is. +We return to the old behaviour and adjust the GUIs description diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 4a0f532..698099c 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -451,8 +451,8 @@ register_rule(group, Alternative( title = _("DNS Server"), elements = [ - FixedValue( value=None, totext=_("use local configuration"), - title = _("Use local DNS configuration of monitoring site")), + FixedValue( value=None, totext=_("this host"), + title = _("Use this host as a DNS server for the lookup")), TextAscii( title = _("Specify DNS Server"), allow_empty = False,

6 years, 5 months

Updated Boost base detection macro.

by Sven Panne

Module: check_mk Branch: master Commit: e866a65954d18392536396db5b1ba84456c16a5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e866a65954d183… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 29 14:25:20 2017 +0100 Updated Boost base detection macro. Change-Id: Ia21bc71b695cd7b84c80ff7a38b4a4308579da68 --- m4/ax_boost_base.m4 | 242 +++++++++++++++++++++++++++------------------------- 1 file changed, 128 insertions(+), 114 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e866a65954…

6 years, 5 months

Require a C++17 compiler.

by Sven Panne

Module: check_mk Branch: master Commit: 4ff3597f77d36c7ca77e02c89cd486950926e9f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ff3597f77d36c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 29 13:59:51 2017 +0100 Require a C++17 compiler. Change-Id: Ib9358a983f3d6e370d43064a9bf3738e0b3c3931 --- Makefile | 11 +---------- configure.ac | 24 +++++++++--------------- livestatus/src/.clang_complete | 2 +- m4/ax_cxx_compile_stdcxx.m4 | 2 +- standalone.make | 10 ++++++---- 5 files changed, 18 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 1c70f50..27b6b63 100644 --- a/Makefile +++ b/Makefile @@ -58,15 +58,6 @@ TAROPTS := --owner=root --group=root --exclude=.svn --exclude=*~ \ --exclude=.gitignore --exclude=*.swp --exclude=.f12 # We could add clang's -Wshorten-64-to-32 and g++'c/clang's -Wsign-conversion here. CXX_FLAGS := -g -O3 -Wall -Wextra - -# HACK: Starting with GCC 6.1, g++ defaults to C++14, but even clang++-4.0 still -# defaults to C++11. So when configure finds such a g++ first, the resulting -# compilation database does not contain a -std=c++14 flag, because it's simply -# not needed. But when we want to use our clang-based tools, it *is* needed. :-/ -# To work around that issue, we hackily add that flag below. This is ugly and -# should be removed when the compiler defaults are in sync again. -CXX_FLAGS += -std=c++14 - CLANG_VERSION := 5.0 CLANG_FORMAT := clang-format-$(CLANG_VERSION) CLANG_TIDY := clang-tidy-$(CLANG_VERSION) @@ -499,7 +490,7 @@ endif # Not really perfect rules, but better than nothing analyze: config.h $(MAKE) -C livestatus clean - cd livestatus && $(SCAN_BUILD) -o ../clang-analyzer $(MAKE) CXXFLAGS="-std=c++14" + cd livestatus && $(SCAN_BUILD) -o ../clang-analyzer $(MAKE) CXXFLAGS="-std=c++17" # TODO: Repeating the include paths in the cppcheck targets below is ugly and # fragile. diff --git a/configure.ac b/configure.ac index 0776b60..b7c9aba 100644 --- a/configure.ac +++ b/configure.ac @@ -49,13 +49,13 @@ AS_IF([test "x$enable_rrd_is_thread_safe" != "xno"], [RRDLIB_TO_CHECK=rrd], [RRDLIB_TO_CHECK=rrd_th]) # Checks for programs. -AC_PROG_CC([gcc-7 clang-5.0 gcc-6 clang-4.0 gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc clang]) +AC_PROG_CC([gcc-7 clang-5.0 gcc clang]) AC_PROG_CC_C99([], []) if test "x$ac_cv_prog_cc_c99" = xno; then AC_MSG_ERROR([Need a C99-compliant C compiler]) fi -AC_PROG_CXX([g++-7 clang++-5.0 g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++]) -AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) +AC_PROG_CXX([g++-7 clang++-5.0 g++ clang++]) +AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) AC_PROG_RANLIB # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it. :-P m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) @@ -93,28 +93,22 @@ fi AC_LANG_PUSH([C++]) -AC_MSG_CHECKING([whether C++14 headers are supported by default]) +AC_MSG_CHECKING([whether C++17 headers are supported by default]) AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([#include <shared_mutex>], [])], + [AC_LANG_PROGRAM([#include <optional> +#include <shared_mutex>], [std::shared_mutex sm])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) CXX="$CXX -stdlib=libc++" CXXCPP="$CXXCPP -stdlib=libc++" - AC_MSG_CHECKING([whether C++14 headers are supported with -stdlib=libc++]) + AC_MSG_CHECKING([whether C++17 headers are supported with -stdlib=libc++]) AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([#include <shared_mutex>], [])], + [AC_LANG_PROGRAM([#include <optional> +#include <shared_mutex>], [std::shared_mutex sm])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AC_MSG_ERROR([C++ headers are too old. Please install a newer g++/clang/libc++-dev package.])])]) -AC_MSG_CHECKING([whether <shared_mutex> defines std::shared_timed_mutex]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([#include <shared_mutex>], [std::shared_timed_mutex stm])], - [AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_STD_SHARED_TIMED_MUTEX, 1, - [Define to 1 if <shared_mutex> defines std::shared_timed_mutex])], - [AC_MSG_RESULT([no])]) - AC_LANG_POP([C++]) # Checks for typedefs, structures, and compiler characteristics. diff --git a/livestatus/src/.clang_complete b/livestatus/src/.clang_complete index 22f5fdd..ec64bce 100644 --- a/livestatus/src/.clang_complete +++ b/livestatus/src/.clang_complete @@ -2,6 +2,6 @@ -I../.. -I.. -DHAVE_CONFIG_H --std=c++14 +-std=c++17 -Wall -Wextra diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 index 5032bba..eac609f 100644 --- a/m4/ax_cxx_compile_stdcxx.m4 +++ b/m4/ax_cxx_compile_stdcxx.m4 @@ -139,7 +139,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl [define if the compiler supports basic C++$1 syntax]) fi AC_SUBST(HAVE_CXX$1) - m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks may change in incompatible ways anytime])]) +# m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks may change in incompatible ways anytime])]) ]) diff --git a/standalone.make b/standalone.make index a90bd61..e547a9a 100644 --- a/standalone.make +++ b/standalone.make @@ -24,11 +24,13 @@ # TODO(sp) We should really use autotools here... ifneq ($(shell which g++-7 2>/dev/null),) - CXX := g++-7 -std=c++14 -else ifneq ($(shell which g++-6 2>/dev/null),) - CXX := g++-6 -std=c++14 + CXX := g++-7 -std=c++17 +else ifneq ($(shell which clang++-5.0 2>/dev/null),) + CXX := clang++-5.0 -std=c++17 +else ifneq ($(shell which g++ 2>/dev/null),) + CXX := g++ -std=c++17 else - CXX := g++-5 -std=c++14 + CXX := clang++ -std=c++17 endif CXXFLAGS := -g -O3 -Wall -Wextra

6 years, 5 months

Fixed typo.

by Sven Panne

Module: check_mk Branch: master Commit: 4ff2adfe5c887900b85a1a4fa3cea902221229af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ff2adfe5c8879… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 29 09:38:01 2017 +0100 Fixed typo. Change-Id: If4c4b96c39dc6c748c609cda11e73105953fdaa9 --- tests/livestatus/test_liveproxyd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/livestatus/test_liveproxyd.py b/tests/livestatus/test_liveproxyd.py index 6968c14..b451b2b 100644 --- a/tests/livestatus/test_liveproxyd.py +++ b/tests/livestatus/test_liveproxyd.py @@ -6,7 +6,7 @@ import pytest import signal from testlib import web -pytestmark = pytest.mark.skipif(True, "liveproxyd remains in an unkillable state with tons of child processes") +pytestmark = pytest.mark.skipif(True, reason="liveproxyd remains in an unkillable state with tons of child processes") @pytest.fixture(scope="module") def default_cfg(web):

6 years, 5 months

Temporarily disable liveproxyd tests, they leave the site in an unusable state.

by Sven Panne

Module: check_mk Branch: master Commit: 58781f91b7a0a95fe0206f6c3c34fa8362f46090 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58781f91b7a0a9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 29 08:31:24 2017 +0100 Temporarily disable liveproxyd tests, they leave the site in an unusable state. Change-Id: Ib1066d240e968d7efdaab3564b10c5729b8d62f0 --- tests/livestatus/test_liveproxyd.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/livestatus/test_liveproxyd.py b/tests/livestatus/test_liveproxyd.py index 1017f5b..6968c14 100644 --- a/tests/livestatus/test_liveproxyd.py +++ b/tests/livestatus/test_liveproxyd.py @@ -6,6 +6,8 @@ import pytest import signal from testlib import web +pytestmark = pytest.mark.skipif(True, "liveproxyd remains in an unkillable state with tons of child processes") + @pytest.fixture(scope="module") def default_cfg(web): print "Applying default config"

6 years, 5 months

5598 FIX postfix_mailq_status: Fix Linux agent to handle newer SuSE systems

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0bf102db5699bd89fb36621fae640ae902b3b04d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bf102db5699bd… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Dec 28 13:55:32 2017 +0100 5598 FIX postfix_mailq_status: Fix Linux agent to handle newer SuSE systems Postfixes master executable can be found under postfix/sbin or postfix/bin depending on the system. The latter case had not been handled by the agent. This has been fixed. Thanks to Robert Sander for the patch! Change-Id: Ie88e80527d83b9a8f421c989d2aa299e85da1efc --- .werks/5598 | 15 +++++++++++++++ agents/check_mk_agent.linux | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/5598 b/.werks/5598 new file mode 100644 index 0000000..ceba293 --- /dev/null +++ b/.werks/5598 @@ -0,0 +1,15 @@ +Title: postfix_mailq_status: Fix Linux agent to handle newer SuSE systems +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1514465574 + +Postfixes master executable can be found under postfix/sbin or postfix/bin +depending on the system. The latter case had not been handled by the agent. +This has been fixed. + +Thanks to Robert Sander for the patch! diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index ebe697a..8354e1a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -694,7 +694,7 @@ if type postfix >/dev/null ; then if [ -e "$i/pid/master.pid" ]; then if [ -r "$i/pid/master.pid" ]; then postfix_pid=$(cat $i/pid/master.pid | sed 's/ //g') # handle possible spaces in output - if readlink -- "/proc/$postfix_pid/exe" | grep -q ".*postfix/$sbin/$\?master.*"; then + if readlink -- "/proc/$postfix_pid/exe" | grep -q ".*postfix/$s\?bin/$\?master.*"; then echo "$i:the Postfix mail system is running:PID:$postfix_pid" | sed 's/\/var\/spool\///g' else echo "$i:PID file exists but instance is not running!" | sed 's/\/var\/spool\///g'

6 years, 5 months

checktestlib: Make PerfValue objects comparable to each other,

by Konstantin Büttner

add helper method to CheckResult to get a flat list of perf values Message-ID: <5a3d2e78.LzSROzI62AwWmy8z%kb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: fe718466f95a3c822a77f712b4492dd30efb7965 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe718466f95a3c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Dec 22 17:03:56 2017 +0100 checktestlib: Make PerfValue objects comparable to each other, add helper method to CheckResult to get a flat list of perf values Change-Id: If4dbd8066d585090ea3eff7bfe91ec58487f6980 --- tests/checks/checktestlib.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 492f10b..ab1aa68 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -27,6 +27,19 @@ class PerfValue(object): assert type(maximum) in [int, float, types.NoneType] self.maximum = maximum + def __eq__(self, other_value): + return all([ + self.key == other_value.key, + self.value == other_value.value, + self.warn == other_value.warn, + self.crit == other_value.crit, + self.minimum == other_value.minimum, + self.maximum == other_value.maximum, + ]) + + def __ne__(self, other_value): + return not self.__eq__(other_value) + class BasicCheckResult(object): """ @@ -76,3 +89,10 @@ class CheckResult(object): self.subresults.append(BasicCheckResult(*subresult)) else: self.subresults = [ BasicCheckResult(*result) ] + + # TODO: @property this + def perfdata(self): + perfdata = [] + for subresult in self.subresults: + perfdata += subresult.perfdata if subresult.perfdata else [] + return perfdata

6 years, 6 months

Windows agent: manage resources in std containers

by Jukka Aro

Module: check_mk Branch: master Commit: edfb699d6df8d3e139ed9283393284826a3f0678 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=edfb699d6df8d3… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Dec 22 14:59:41 2017 +0100 Windows agent: manage resources in std containers SectionEventlog: let std::vector manage its memory as it can do it better than you do it yourself. Change-Id: I9fd2e4c28dd79d25b07142f6ab671e1e522c6fc2 --- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 32 ++++++++++-------------------- agents/windows/types.h | 6 ++++-- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index c930dca..36ed094 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3038 +3040 diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 609994d..a63f639 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -42,14 +42,7 @@ SectionEventlog::SectionEventlog(Configuration &config, Logger *logger, config.reg("logwatch", "logfile", &_config); } -SectionEventlog::~SectionEventlog() { - _state.clear(); - for (auto ptr : _hints) { - free(ptr->name); - delete ptr; - } - _hints.clear(); -} +SectionEventlog::~SectionEventlog() {} void SectionEventlog::parseStateLine(char *line) { /* Example: line = "System|1234" */ @@ -64,10 +57,7 @@ void SectionEventlog::parseStateLine(char *line) { if (!token) return; - eventlog_hint_t *elh = new eventlog_hint_t(); - elh->name = strdup(path); - elh->record_no = std::stoull(token); - _hints.push_back(elh); + _hints.emplace_back(path, std::stoull(token)); } void SectionEventlog::loadEventlogOffsets(const std::string &statefile) { @@ -90,9 +80,9 @@ void SectionEventlog::saveEventlogOffsets(const std::string &statefile) { fprintf(stderr, "failed to open %s for writing\n", statefile.c_str()); return; } - for (eventlog_file_state &state : _state) { + for (const auto &state : _state) { int level = 1; - for (eventlog_config_entry &config : *_config) { + for (const auto &config : *_config) { if ((config.name == "*") || ci_equal(config.name, state.name)) { level = config.level; break; @@ -232,7 +222,7 @@ uint64_t SectionEventlog::outputEventlog(std::ostream &out, const char *logname, // might already be known and will not be stored twice. void SectionEventlog::registerEventlog(const char *logname) { // check if we already know this one... - for (eventlog_file_state &state : _state) { + for (auto &state : _state) { if (state.name.compare(logname) == 0) { state.newly_discovered = true; return; @@ -246,7 +236,7 @@ void SectionEventlog::registerEventlog(const char *logname) { /* Look into the registry in order to find out, which event logs are available. */ bool SectionEventlog::find_eventlogs(std::ostream &out) { - for (eventlog_file_state &state : _state) { + for (auto &state : _state) { state.newly_discovered = false; } @@ -317,11 +307,11 @@ bool SectionEventlog::produceOutputInner(std::ostream &out) { // The last processed record number of each eventlog is stored in the // file eventstate.txt if (_first_run && !*_send_initial) { - for (eventlog_file_state &state : _state) { + for (auto &state : _state) { bool found_hint = false; - for (eventlog_hint_t *hint : _hints) { - if (state.name.compare(hint->name) == 0) { - state.record_no = hint->record_no; + for (const auto &hint : _hints) { + if (state.name == hint.name) { + state.record_no = hint.record_no; found_hint = true; break; } @@ -334,7 +324,7 @@ bool SectionEventlog::produceOutputInner(std::ostream &out) { } } - for (eventlog_file_state &state : _state) { + for (auto &state : _state) { if (!state.newly_discovered) // not here any more! out << "[[[" << state.name << ":missing]]]\n"; else { diff --git a/agents/windows/types.h b/agents/windows/types.h index b79aa77..bc7f997 100644 --- a/agents/windows/types.h +++ b/agents/windows/types.h @@ -248,7 +248,9 @@ struct eventlog_file_state { }; struct eventlog_hint_t { - char *name; + eventlog_hint_t(const std::string &name_, uint64_t record_no_) + : name(name_), record_no(record_no_) {} + std::string name; uint64_t record_no; }; @@ -272,7 +274,7 @@ typedef std::vector<globline_container *> logwatch_globlines_t; typedef std::vector<eventlog_config_entry> eventlog_config_t; typedef std::vector<mrpe_entry *> mrpe_entries_t; typedef std::vector<eventlog_file_state> eventlog_state_t; -typedef std::vector<eventlog_hint_t *> eventlog_hints_t; +typedef std::vector<eventlog_hint_t> eventlog_hints_t; typedef std::vector<char *> fileinfo_paths_t; typedef std::vector<retry_config *> retry_count_configs_t; typedef std::vector<timeout_config *> timeout_configs_t;

6 years, 6 months

Windows agent: use RAII for search handles

by Jukka Aro

Module: check_mk Branch: master Commit: 7525fb1ce2697989bdc5a78ec49eba7f2fa4fdf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7525fb1ce26979… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Dec 22 13:31:22 2017 +0100 Windows agent: use RAII for search handles Change-Id: I27b26e8c85a43671e60e4bee07a561a72b0fd61a --- agents/windows/build_version | 2 +- agents/windows/sections/SectionFileinfo.cc | 26 ++++++++++++-------------- agents/windows/sections/SectionLogwatch.cc | 11 +---------- agents/windows/sections/SectionSpool.cc | 12 ++++++------ agents/windows/types.h | 11 +++++++++++ 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 488b08b..c930dca 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3036 +3038 diff --git a/agents/windows/sections/SectionFileinfo.cc b/agents/windows/sections/SectionFileinfo.cc index aa89c03..3eb4178 100644 --- a/agents/windows/sections/SectionFileinfo.cc +++ b/agents/windows/sections/SectionFileinfo.cc @@ -51,13 +51,13 @@ bool SectionFileinfo::produceOutputInner(std::ostream &out) { void SectionFileinfo::get_directories(std::string base_path) { WIN32_FIND_DATA findData; - HANDLE findHandle; std::stringstream ss; ss << base_path << "\\" << "*.*"; - if ((findHandle = _winapi.FindFirstFile(ss.str().c_str(), &findData)) != - INVALID_HANDLE_VALUE) { + SearchHandle findHandle{_winapi.FindFirstFile(ss.str().c_str(), &findData), + _winapi}; + if (findHandle) { do { if (strcmp(findData.cFileName, ".") && strcmp(findData.cFileName, @@ -72,8 +72,7 @@ void SectionFileinfo::get_directories(std::string base_path) { else _temp_files.push_back(ss.str()); } - } while (_winapi.FindNextFile(findHandle, &findData)); - _winapi.FindClose(findHandle); + } while (_winapi.FindNextFile(findHandle.get(), &findData)); } } @@ -91,12 +90,13 @@ void SectionFileinfo::determine_filepaths_full_search( void SectionFileinfo::determine_filepaths_simple_search( std::string base_path, std::string search_pattern) { WIN32_FIND_DATA data; - auto findHandle = + SearchHandle findHandle{ _winapi.FindFirstFileEx(search_pattern.c_str(), FindExInfoStandard, - &data, FindExSearchNameMatch, NULL, 0); + &data, FindExSearchNameMatch, NULL, 0), + _winapi}; std::stringstream ss; - if (findHandle != INVALID_HANDLE_VALUE) { + if (findHandle) { do { if (0 == (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { ss.str(""); @@ -104,8 +104,7 @@ void SectionFileinfo::determine_filepaths_simple_search( ss << base_path << "\\" << data.cFileName; _found_files.push_back(ss.str()); } - } while (_winapi.FindNextFile(findHandle, &data)); - _winapi.FindClose(findHandle); + } while (_winapi.FindNextFile(findHandle.get(), &data)); } } @@ -144,16 +143,15 @@ void SectionFileinfo::outputFileinfos(std::ostream &out, const char *path) { bool SectionFileinfo::outputFileinfo(std::ostream &out, const std::string filename) { WIN32_FIND_DATA findData; - HANDLE findHandle; - if ((findHandle = _winapi.FindFirstFile(filename.c_str(), &findData)) != - INVALID_HANDLE_VALUE) { + SearchHandle findHandle{_winapi.FindFirstFile(filename.c_str(), &findData), + _winapi}; + if (findHandle) { unsigned long long size = (unsigned long long)findData.nFileSizeLow + (((unsigned long long)findData.nFileSizeHigh) << 32); out << filename << "|" << size << "|" << std::fixed << std::setprecision(0) << file_time(&findData.ftLastWriteTime) << "\n"; - _winapi.FindClose(findHandle); return true; } return false; diff --git a/agents/windows/sections/SectionLogwatch.cc b/agents/windows/sections/SectionLogwatch.cc index a16ac51..dd69279 100644 --- a/agents/windows/sections/SectionLogwatch.cc +++ b/agents/windows/sections/SectionLogwatch.cc @@ -38,15 +38,6 @@ using std::ofstream; namespace { -struct SearchHandleTraits { - using HandleT = HANDLE; - static HandleT invalidValue() { return INVALID_HANDLE_VALUE; } - - static void closeHandle(HandleT value, const WinApiAdaptor &winapi) { - winapi.FindClose(value); - } -}; - const size_t UNICODE_BUFFER_SIZE = 8192; // Process content of the given textfile @@ -206,7 +197,7 @@ std::vector<SectionLogwatch::FileEntryType> SectionLogwatch::globMatches( } WIN32_FIND_DATA data; - WrappedHandle<SearchHandleTraits> searchHandle{ + SearchHandle searchHandle{ _winapi.FindFirstFileEx(pattern, FindExInfoStandard, &data, FindExSearchNameMatch, nullptr, 0), _winapi}; diff --git a/agents/windows/sections/SectionSpool.cc b/agents/windows/sections/SectionSpool.cc index 6635e00..4ae7581 100644 --- a/agents/windows/sections/SectionSpool.cc +++ b/agents/windows/sections/SectionSpool.cc @@ -26,9 +26,9 @@ #include <sys/types.h> #include "Environment.h" #include "Logger.h" -typedef short SHORT; -#include "WinApiAdaptor.h" #include "SectionSpool.h" +#include "WinApiAdaptor.h" +#include "types.h" extern double file_time(const FILETIME *filetime); @@ -64,12 +64,12 @@ bool SectionSpool::produceOutputInner(std::ostream &out) { if (isdigit(*name)) max_age = atoi(name); if (max_age >= 0) { - HANDLE h = + SearchHandle searchHandle{ _winapi.FindFirstFileEx(path, FindExInfoStandard, &filedata, - FindExSearchNameMatch, NULL, 0); - if (h != INVALID_HANDLE_VALUE) { + FindExSearchNameMatch, NULL, 0), + _winapi}; + if (searchHandle) { double mtime = file_time(&(filedata.ftLastWriteTime)); - _winapi.FindClose(h); int age = now - mtime; if (age > max_age) { Informational(_logger) diff --git a/agents/windows/types.h b/agents/windows/types.h index c4b20eb..b79aa77 100644 --- a/agents/windows/types.h +++ b/agents/windows/types.h @@ -482,4 +482,15 @@ struct ServiceHandleTraits { using ServiceHandle = WrappedHandle<ServiceHandleTraits>; +struct SearchHandleTraits { + using HandleT = HANDLE; + static HandleT invalidValue() { return INVALID_HANDLE_VALUE; } + + static void closeHandle(HandleT value, const WinApiAdaptor &winapi) { + winapi.FindClose(value); + } +}; + +using SearchHandle = WrappedHandle<SearchHandleTraits>; + #endif // types_h

6 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2017