Don't run event commands when hosts/services are OK

fixes #6686

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index 9e287e5a9e83d27244016a3ea5dfb71cd2c40e26..4efc0faa69b66eb8a77c87bfbdaf3f84269791dc 100644 (file)
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -264,12 +264,14 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
        long attempt = 1;
 
        if (!old_cr) {
+               recovery = false;
                SetStateType(StateTypeHard);
        } else if (cr->GetState() == ServiceOK) {
-               if (old_state == ServiceOK && old_stateType == StateTypeSoft)
+               if (old_state == ServiceOK && old_stateType == StateTypeSoft) {
                        SetStateType(StateTypeHard); // SOFT OK -> HARD OK
+                       recovery = true;
+               }
 
-               recovery = true;
                ResetNotificationNumbers();
                SetLastStateOK(Utility::GetTime());
        } else {