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

Fix: Set last state/state type before executing service checks.

This commit is contained in:
Gunnar Beutner 2013-03-08 14:43:48 +01:00
parent 8337795ff7
commit fb82b73bc9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/icinga/service-check.cpp
View File

@ -381,6 +381,8 @@ void Service::ProcessCheckResult(const Dictionary::Ptr& cr)
bool hardChange = false; bool hardChange = false;
bool recovery; bool recovery;
/* The BeginExecuteCheck function already sets the old state, but we need to do it again
* in case this was a passive check result. */
SetLastState(old_state); SetLastState(old_state);
SetLastStateType(old_stateType); SetLastStateType(old_stateType);
@ -587,6 +589,9 @@ void Service::BeginExecuteCheck(const function<void (void)>& callback)
} }
m_CheckRunning = true; m_CheckRunning = true;
SetLastState(GetState());
SetLastStateType(GetLastStateType());
} }
/* keep track of scheduling info in case the check type doesn't provide its own information */ /* keep track of scheduling info in case the check type doesn't provide its own information */