[icinga-checkins] icinga.org: icinga-core/cmaser/fixes: core: fix flexible downtime on service hard state change doesn't get triggered/ activated #1128

git at icinga.org git at icinga.org
Mon Mar 7 14:58:17 CET 2011


Module: icinga-core
Branch: cmaser/fixes
Commit: 7506386837a1ac856419262ab3aeab916c07b9db
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=7506386837a1ac856419262ab3aeab916c07b9db

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Feb 21 18:17:17 2011 +0100

core: fix flexible downtime on service hard state change doesn't get triggered/activated #1128

fixes #1228

---

 Changelog     |    6 ++++++
 base/checks.c |    3 ++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index df584c3..4222a1b 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,12 @@
 Icinga 1.3.x Change Log
 #######################
 
+1.3.1 - ??/??/2011
+
+FIXES
+* core: fix flexible downtime on service hard state change doesn't get triggered/activated #1128
+
+
 1.3.0 - 16/02/2011
 
 ENHANCEMENTS
diff --git a/base/checks.c b/base/checks.c
index 4600a8f..0cda638 100644
--- a/base/checks.c
+++ b/base/checks.c
@@ -1675,7 +1675,8 @@ int handle_async_service_check_result(service *temp_service, check_result *queue
 			}
 
 			/* check for start of flexible (non-fixed) scheduled downtime if we just had a hard/soft error */
-			if(state_change==TRUE && temp_service->pending_flex_downtime>0)
+			/* 2011-02-21 MF: we need to check for both, state_change (SOFT) and hard_state_change (HARD) values */
+			if((hard_state_change==TRUE || state_change==TRUE) && temp_service->pending_flex_downtime>0)
 				check_pending_flex_service_downtime(temp_service);
 
 			/* 10/04/07 check to see if the service and/or associate host is flapping */





More information about the icinga-checkins mailing list