From 962d0e5fb24f4e7a5867bf22f98dc1e0a6649468 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sat, 9 Feb 2013 19:12:30 +0100 Subject: [PATCH] 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 41f6c282a..742099348 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 4563e1716..da7b19384 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; } -- 2.40.0