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

Fix incorrect behavior for max_check_attempts 

fixes #11898
This commit is contained in:
Gunnar Beutner 2016-08-08 11:02:08 +02:00
parent 26821d1a79
commit 597dc0dea2
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,9 +177,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
std::set<Checkable::Ptr> children = GetChildren(); std::set<Checkable::Ptr> children = GetChildren();
if (!old_cr) { if (IsStateOK(cr->GetState())) {
SetStateType(StateTypeSoft);
} else if (IsStateOK(cr->GetState())) {
SetStateType(StateTypeHard); // NOT-OK -> HARD OK SetStateType(StateTypeHard); // NOT-OK -> HARD OK
if (!IsStateOK(old_state)) if (!IsStateOK(old_state))
@ -192,7 +190,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
if (!children.empty()) if (!children.empty())
OnReachabilityChanged(this, cr, children, origin); OnReachabilityChanged(this, cr, children, origin);
} else { } else {
if (old_attempt >= GetMaxCheckAttempts()) { if (old_attempt + 1 >= GetMaxCheckAttempts()) {
SetStateType(StateTypeHard); SetStateType(StateTypeHard);
} else if (old_stateType == StateTypeSoft && !IsStateOK(old_state)) { } else if (old_stateType == StateTypeSoft && !IsStateOK(old_state)) {
SetStateType(StateTypeSoft); SetStateType(StateTypeSoft);
@ -284,9 +282,6 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
send_notification = true; send_notification = true;
} }
if (!old_cr)
send_notification = false; /* Don't send notifications for the initial state change */
if (IsStateOK(old_state) && old_stateType == StateTypeSoft) if (IsStateOK(old_state) && old_stateType == StateTypeSoft)
send_notification = false; /* Don't send notifications for SOFT-OK -> HARD-OK. */ send_notification = false; /* Don't send notifications for SOFT-OK -> HARD-OK. */