[checkmk-commits] 5034 FIX Do not skip first entry in Windows eventlog

Module: check_mk Branch: master Commit: 2acc0bab874ced06914099d0d2a363933552231e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2acc0bab874ced… Author: Jukka Aro &lt;ja(a)mathias-kettner.de&gt; Date: Mon Sep 25 11:53:07 2017 +0200 5034 FIX Do not skip first entry in Windows eventlog Change-Id: I27ad8b00fc69460c2d66e84720e0f343c0153c5e --- .werks/5034 | 11 +++++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1565696 -> 1565696 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 22788184 -> 22788184 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1565696 -> 1565696 bytes agents/windows/check_mk_agent.exe | Bin 1548800 -> 1548800 bytes agents/windows/check_mk_agent.msi | Bin 3388416 -> 3388416 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 19628575 -> 19628575 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1548800 -> 1548800 bytes agents/windows/crash.exe | Bin 358864 -> 358864 bytes agents/windows/install_agent-64.exe | Bin 681445 -> 681479 bytes agents/windows/install_agent.exe | Bin 676321 -> 676294 bytes agents/windows/nowin.exe | Bin 361000 -> 361000 bytes agents/windows/plugins/mk_jolokia.exe | Bin 10106814 -> 10106814 bytes agents/windows/sections/SectionEventlog.cc | 2 +- 15 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/5034 b/.werks/5034 new file mode 100644 index 0000000..4aec9a5 --- /dev/null +++ b/.werks/5034 @@ -0,0 +1,11 @@ +Title: Do not skip first entry in Windows eventlog +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506332777 +Class: fix +Under certain circumstances, the first entry in Windows eventlog was skipped after starting the Windows agent. Now the first entry is always processed as expected. + + diff --git a/agents/windows/build_version b/agents/windows/build_version index ca6b285..004f50e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2930 +2932 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index b25ea52..89f0811 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 2d98db5..d276630 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 8ffadee..cfacf5d 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 95e5761..49ac323 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 98f3486..033e7ce 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 2fba349..2bb1a6d 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 f33fcf1..2431dfe 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/crash.exe b/agents/windows/crash.exe index 0a372ec..5b4e532 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index b3fa517..f194649 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 f5cfc01..8223242 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 627f396..c83e8aa 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/agents/windows/plugins/mk_jolokia.exe b/agents/windows/plugins/mk_jolokia.exe index de94659..21327e4 100755 Binary files a/agents/windows/plugins/mk_jolokia.exe and b/agents/windows/plugins/mk_jolokia.exe differ diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 558422c..49b2ec7 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -178,7 +178,7 @@ void SectionEventlog::outputEventlog(std::ostream &out, const char *logname, // it bool record_maxxed = std::numeric_limits<uint64_t>::max() == first_record; - first_record = log->seek(first_record + (record_maxxed ? 0 : 1)); + log->seek(first_record + (record_maxxed ? 0 : 1)); uint64_t last_record = first_record;