[icinga-checkins] icinga.org: icinga2/master: Build fix.

git at icinga.org git at icinga.org
Sat Feb 9 19:24:52 CET 2013


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

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Sat Feb  9 19:12:30 2013 +0100

Build fix.

---

 lib/icinga/host.cpp    |    6 +++---
 lib/icinga/service.cpp |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 41f6c28..7420993 100644
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -437,9 +437,9 @@ Dictionary::Ptr Host::CalculateDynamicMacros(void) const
 
 	if (hostcheck) {
 		macros->Set("HOSTSTATEID", 99);
-		macros->Set("HOSTSTATETYPE", Service::StateTypeToString(hostcheck->GetStateType());
-		macros->Set("HOSTATTEMPT", hostcheck->GetCurrentAttempt());
-		macros->Set("MAXHOSTATTEMPT", hostcheck->GetMaxAttempts());
+		macros->Set("HOSTSTATETYPE", Service::StateTypeToString(hostcheck->GetStateType()));
+		macros->Set("HOSTATTEMPT", hostcheck->GetCurrentCheckAttempt());
+		macros->Set("MAXHOSTATTEMPT", hostcheck->GetMaxCheckAttempts());
 	}
 
 	return macros;
diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 4563e17..da7b193 100644
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -278,8 +278,8 @@ Dictionary::Ptr Service::CalculateDynamicMacros(void) const
 	macros->Set("SERVICESTATE", StateToString(GetState()));
 	macros->Set("SERVICESTATEID", GetState());
 	macros->Set("SERVICESTATETYPE", StateTypeToString(GetStateType()));
-	macros->Set("SERVICEATTEMPT", GetCurrentAttempt());
-	macros->Set("MAXSERVICEATTEMPT", GetMaxAttempts());
+	macros->Set("SERVICEATTEMPT", GetCurrentCheckAttempt());
+	macros->Set("MAXSERVICEATTEMPT", GetMaxCheckAttempts());
 
 	return macros;
 }





More information about the icinga-checkins mailing list