Build fix.

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 41f6c282a5f63273454344a004bac2a7a7ea1541..7420993486f4121d493999a213b3afb9affe7431 100644 (file)
--- 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 4563e1716db7078d6a006f1b999da2e9da7cec2a..da7b1938449b85d16392d486406d91038475da24 100644 (file)
--- 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;
 }