tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7163 from Icinga/bugfix/db-ido-reachable 

DB IDO: Use cached reachable state
This commit is contained in:
Michael Friedrich 2019-05-07 15:21:21 +02:00 committed by GitHub
parent 11dc30407c 5553438249
commit 296fc06890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/db_ido/hostdbobject.cpp
View File

@ -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));

2
lib/db_ido/servicedbobject.cpp
View File

@ -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));