From: Michael Friedrich <michael.friedrich@netways.de>
Date: Mon, 13 Jun 2016 08:09:18 +0000 (+0200)
Subject: DB IDO: Ensure that SOFT state changes with the same state are logged
X-Git-Tag: v2.5.0~266
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7f976b962661a3dc38a122d4ee0a967dd6518d2;p=icinga2

DB IDO: Ensure that SOFT state changes with the same state are logged

fixes #11933
---

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index 4e64d9256..0fe57af71 100644
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -355,7 +355,9 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
 		OnStateChange(this, cr, StateTypeHard, origin);
 		Log(LogNotice, "Checkable")
 		    << "State Change: Checkable " << GetName() << " hard state change from " << old_state_str << " to " << new_state_str << " detected." << (is_volatile ? " Checkable is volatile." : "");
-	} else if (stateChange) {
+	}
+	/* Whether a state change happened or the state type is SOFT (must be logged too). */
+	else if (stateChange || GetStateType() == StateTypeSoft) {
 		OnStateChange(this, cr, StateTypeSoft, origin);
 		Log(LogNotice, "Checkable")
 		    << "State Change: Checkable " << GetName() << " soft state change from " << old_state_str << " to " << new_state_str << " detected.";