tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 15:44:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7789 from Icinga/feature/nextupdate-passive

Browse Source 
Checkable#next_update: always use #check_interval if !#enable_active_checks
This commit is contained in:
Noah Hilverling 2020-03-06 10:58:08 +01:00 committed by GitHub
commit b8d518bce7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/checkable.cpp
View File

@ -195,7 +195,7 @@ Timestamp Checkable::GetNextUpdate() const
double interval, latency; double interval, latency;
if (cr) { if (cr) {
interval = GetProblem() && GetStateType() == StateTypeSoft ? GetRetryInterval() : GetCheckInterval(); interval = GetEnableActiveChecks() && GetProblem() && GetStateType() == StateTypeSoft ? GetRetryInterval() : GetCheckInterval();
latency = cr->GetExecutionEnd() - cr->GetScheduleStart(); latency = cr->GetExecutionEnd() - cr->GetScheduleStart();
} else { } else {
interval = GetCheckInterval(); interval = GetCheckInterval();