DB IDO: Use cached reachable state

fixes #6844

diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp
index eb93f8b11a4d1cde23393b372bbe8a1a024555ea..18be0bd5269fbc6066ad994ee86c73c56e7a957a 100644 (file)
--- a/lib/db_ido/hostdbobject.cpp
+++ b/lib/db_ido/hostdbobject.cpp
@@ -90,7 +90,7 @@ Dictionary::Ptr HostDbObject::GetStatusFields() const
 
        int currentState = host->GetState();
 
-       if (currentState != HostUp && !host->IsReachable())
+       if (currentState != HostUp && !host->GetLastReachable())
                currentState = 2; /* hardcoded compat state */
 
        fields->Set("current_state", currentState);
@@ -122,7 +122,7 @@ Dictionary::Ptr HostDbObject::GetStatusFields() const
        fields->Set("normal_check_interval", host->GetCheckInterval() / 60.0);
        fields->Set("retry_check_interval", host->GetRetryInterval() / 60.0);
        fields->Set("check_timeperiod_object_id", host->GetCheckPeriod());
-       fields->Set("is_reachable", host->IsReachable());
+       fields->Set("is_reachable", host->GetLastReachable());
        fields->Set("original_attributes", JsonEncode(host->GetOriginalAttributes()));
 
        fields->Set("current_notification_number", CompatUtility::GetCheckableNotificationNotificationNumber(host));

diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
index b31b1fc4c6322a6a1af35aabbf6ad159e50eee88..ac1f78897566745870151927464a57028a753e9f 100644 (file)
--- a/lib/db_ido/servicedbobject.cpp
+++ b/lib/db_ido/servicedbobject.cpp
@@ -119,7 +119,7 @@ Dictionary::Ptr ServiceDbObject::GetStatusFields() const
        fields->Set("normal_check_interval", service->GetCheckInterval() / 60.0);
        fields->Set("retry_check_interval", service->GetRetryInterval() / 60.0);
        fields->Set("check_timeperiod_object_id", service->GetCheckPeriod());
-       fields->Set("is_reachable", service->IsReachable());
+       fields->Set("is_reachable", service->GetLastReachable());
        fields->Set("original_attributes", JsonEncode(service->GetOriginalAttributes()));
 
        fields->Set("current_notification_number", CompatUtility::GetCheckableNotificationNotificationNumber(service));