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

Fix checkresults from the future breaking checks

This commit is contained in:
Jean Flach 2019-01-11 16:16:45 +01:00 committed by Michael Friedrich
parent d2755351d3
commit c97f3c80f5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/icinga/checkable-check.cpp
View File

@ -170,8 +170,8 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
long old_attempt = GetCheckAttempt(); long old_attempt = GetCheckAttempt();
bool recovery = false; bool recovery = false;
/* Ignore check results older than the current one. */ /* Ignore check results older than the current one, except if the previous check result is from the future. */
if (old_cr && cr->GetExecutionStart() < old_cr->GetExecutionStart()) if (old_cr && cr->GetExecutionStart() < old_cr->GetExecutionStart() && old_cr->GetExecutionStart() < now)
return; return;
/* The ExecuteCheck function already sets the old state, but we need to do it again /* The ExecuteCheck function already sets the old state, but we need to do it again