From 5553438249f57e11c38a0a35c717173761120fe8 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Tue, 7 May 2019 13:47:09 +0200 Subject: [PATCH] DB IDO: Use cached reachable state fixes #6844 --- lib/db_ido/hostdbobject.cpp | 4 ++-- lib/db_ido/servicedbobject.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp index eb93f8b11..18be0bd52 100644 --- 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 b31b1fc4c..ac1f78897 100644 --- 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)); -- 2.40.0