Make change to OK always a hard state

refs #11654

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index f912e8291452a5f2a946d9b996f8d717ee231dd2..fc5e88e8df32a387659472cb993a047675ce4ce7 100644 (file)
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -180,13 +180,10 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
        if (!old_cr) {
                SetStateType(StateTypeHard);
        } else if (IsStateOK(cr->GetState())) {
-               if (IsStateOK(old_state) && old_stateType == StateTypeSoft) {
-                       SetStateType(StateTypeHard); // SOFT OK -> HARD OK
-                       recovery = true;
-               }
+               SetStateType(StateTypeHard); // NOT-OK -> HARD OK
 
                if (!IsStateOK(old_state))
-                       recovery = true; // NOT OK -> SOFT/HARD OK
+                       recovery = true;
 
                ResetNotificationNumbers();
                SaveLastState(ServiceOK, Utility::GetTime());