[Pkg-nagios-changes] [pkg-icinga2] 01/04: Imported Upstream version 2.4.10

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch debmon-wheezy
in repository pkg-icinga2.

commit c5525bcea1458d6eeb98a8ff9a2769309301dae0
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu May 19 13:40:58 2016 +0200

    Imported Upstream version 2.4.10
---
 ChangeLog                        | 6 ++++++
 doc/1-about.md                   | 6 ++++++
 icinga2.nuspec                   | 2 +-
 icinga2.spec                     | 2 +-
 lib/checker/checkercomponent.cpp | 5 ++++-
 lib/methods/pluginchecktask.cpp  | 5 +++--
 tools/chocolateyInstall.ps1      | 4 ++--
 7 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9eec36f..0517cf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,12 @@ Please check [doc/1-about.md].
 
 ## What's New
 
+### What's New in Version 2.4.10
+
+#### Bugfixes
+
+* Bug 11812 (Checker): Checker component doesn't execute any checks for command_endpoint
+
 ### What's New in Version 2.4.9
 
 #### Changes
diff --git a/doc/1-about.md b/doc/1-about.md
index 33c3745..b9d4e16 100644
--- a/doc/1-about.md
+++ b/doc/1-about.md
@@ -54,6 +54,12 @@ More details in the [Icinga FAQ](https://www.icinga.org/icinga/faq/).
 
 ## <a id="whats-new"></a> What's New
 
+### What's New in Version 2.4.10
+
+#### Bugfixes
+
+* Bug [11812](https://dev.icinga.org/issues/11812 "Bug 11812") (Checker): Checker component doesn't execute any checks for command_endpoint
+
 ### What's New in Version 2.4.9
 
 #### Changes
diff --git a/icinga2.nuspec b/icinga2.nuspec
index 6ad7e26..86b1957 100755
--- a/icinga2.nuspec
+++ b/icinga2.nuspec
@@ -6,7 +6,7 @@
     <!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->
     <id>icinga2</id>
     <title>Icinga2</title>
-    <version>2.4.9</version>
+    <version>2.4.10</version>
     <authors>2016 - The Icinga Project</authors>
     <owners>Icinga Development Team</owners>
     <summary>icinga2 - Monitoring Agent for Windows</summary>
diff --git a/icinga2.spec b/icinga2.spec
index 2ec7709..10fc340 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.4.9
+Version: 2.4.10
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System
diff --git a/lib/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp
index fb9d871..bfb997f 100644
--- a/lib/checker/checkercomponent.cpp
+++ b/lib/checker/checkercomponent.cpp
@@ -121,7 +121,10 @@ void CheckerComponent::CheckThreadProc(void)
 
 		double wait = checkable->GetNextCheck() - Utility::GetTime();
 
-		if (wait > 0 || Checkable::GetPendingChecks() >= GetConcurrentChecks()) {
+		if (Checkable::GetPendingChecks() >= GetConcurrentChecks())
+			wait = 0.5;
+
+		if (wait > 0) {
 			/* Wait for the next check. */
 			m_CV.timed_wait(lock, boost::posix_time::milliseconds(wait * 1000));
 
diff --git a/lib/methods/pluginchecktask.cpp b/lib/methods/pluginchecktask.cpp
index c1b1942..d53e287 100644
--- a/lib/methods/pluginchecktask.cpp
+++ b/lib/methods/pluginchecktask.cpp
@@ -52,11 +52,12 @@ void PluginCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckRes
 	resolvers.push_back(std::make_pair("command", commandObj));
 	resolvers.push_back(std::make_pair("icinga", IcingaApplication::GetInstance()));
 
-	Checkable::IncreasePendingChecks();
-
 	PluginUtility::ExecuteCommand(commandObj, checkable, checkable->GetLastCheckResult(),
 	    resolvers, resolvedMacros, useResolvedMacros,
 	    boost::bind(&PluginCheckTask::ProcessFinishedHandler, checkable, cr, _1, _2));
+
+	if (!resolvedMacros || useResolvedMacros)
+		Checkable::IncreasePendingChecks();
 }
 
 void PluginCheckTask::ProcessFinishedHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const Value& commandLine, const ProcessResult& pr)
diff --git a/tools/chocolateyInstall.ps1 b/tools/chocolateyInstall.ps1
index 2d0013b..d622a31 100755
--- a/tools/chocolateyInstall.ps1
+++ b/tools/chocolateyInstall.ps1
@@ -1,7 +1,7 @@
 $packageName = 'icinga2'
 $installerType = 'msi'
-$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.4.9-x86.msi'
-$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.9-x86_64.msi'
+$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.4.10-x86.msi'
+$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.10-x86_64.msi'
 $silentArgs = '/qn /norestart'
 $validExitCodes = @(0)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git