From: Michael Friedrich <michael.friedrich@netways.de>
Date: Tue, 23 Aug 2016 12:35:59 +0000 (+0200)
Subject: Fix that recovery notifications are sent in SOFT NOT-OK states
X-Git-Tag: v2.6.0~238
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd1b2cdddd55d4c365ad6029d4d67be3cdb7d281;p=icinga2

Fix that recovery notifications are sent in SOFT NOT-OK states

fixes #12517
---

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index 9080d6739..a064a80ae 100644
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -183,7 +183,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
 	if (IsStateOK(cr->GetState())) {
 		SetStateType(StateTypeHard); // NOT-OK -> HARD OK
 
-		if (!IsStateOK(old_state))
+		if (old_stateType == StateTypeHard && !IsStateOK(old_state))
 			recovery = true;
 
 		ResetNotificationNumbers();