[icinga-checkins] icinga.org: icinga2/master: Bugfix: Reschedule the delegation timer after starting it.

git at icinga.org git at icinga.org
Wed Feb 13 12:18:49 CET 2013


Module: icinga2
Branch: master
Commit: 34cc7347ca2f7c3b4baa2f98b4e890d566cbebf7
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=34cc7347ca2f7c3b4baa2f98b4e890d566cbebf7

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Wed Feb 13 12:18:36 2013 +0100

Bugfix: Reschedule the delegation timer after starting it.

---

 components/delegation/delegationcomponent.cpp |    2 +-
 docs/icinga2-config.txt                       |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/components/delegation/delegationcomponent.cpp b/components/delegation/delegationcomponent.cpp
index 0ec753e..fb00b43 100644
--- a/components/delegation/delegationcomponent.cpp
+++ b/components/delegation/delegationcomponent.cpp
@@ -29,9 +29,9 @@ void DelegationComponent::Start(void)
 	m_DelegationTimer = boost::make_shared<Timer>();
 	// TODO: implement a handler for config changes for the delegation_interval variable
 	m_DelegationTimer->SetInterval(GetDelegationInterval());
-	m_DelegationTimer->Reschedule(Utility::GetTime() + 10);
 	m_DelegationTimer->OnTimerExpired.connect(boost::bind(&DelegationComponent::DelegationTimerHandler, this));
 	m_DelegationTimer->Start();
+	m_DelegationTimer->Reschedule(Utility::GetTime() + 10);
 }
 
 double DelegationComponent::GetDelegationInterval(void) const
diff --git a/docs/icinga2-config.txt b/docs/icinga2-config.txt
index 61c280b..f284ed8 100644
--- a/docs/icinga2-config.txt
+++ b/docs/icinga2-config.txt
@@ -88,6 +88,18 @@ NOTE: Identifiers may not contain certain characters (e.g. space) or start with
 certain characters (e.g. digits). If you want to use a dictionary key that is
 not a valid identifier you can put the key in double quotes.
 
+Array
+^^^^^
+
+Arrays are ordered lists of strings. This is unlike dictionary which are not
+guaranteed to be in any particular order.
+
+Example:
+
+-------------------------------------------------------------------------------
+[ "/usr/local/icinga/libexec/check_ping", "-H", "$address$" ]
+-------------------------------------------------------------------------------
+
 Operators
 ~~~~~~~~~
 





More information about the icinga-checkins mailing list