[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: core: fix bug where passive host check status updates were not being propagated to event brokers (Ethan Galstad) #1134

[git at icinga.org]

Module: icinga-core
Branch: mfriedrich/core
Commit: 8819fad570bd040f6c466553009d987e1da09314
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=8819fad570bd040f6c466553009d987e1da09314

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Jan 21 09:09:19 2011 +0100

core: fix bug where passive host check status updates were not being propagated to event brokers (Ethan Galstad) #1134

fixes #1134

---

 Changelog     |    1 +
 base/checks.c |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index c7d12c0..90b02bc 100644
--- a/Changelog
+++ b/Changelog
@@ -71,6 +71,7 @@ FIXES
 * core: fix extraneous alerts for services when host is down (Ton Voon) #1097
 * core: reduce duplication of code for is_contact_member_of_contactgroup (Stephen Gran) #1126
 * core: fix bug with passive host checks being incorrectly sent to event brokers as active checks (Ethan Galstad) #1133
+* core: fix bug where passive host check status updates were not being propagated to event brokers (Ethan Galstad) #1134
 
 * classic ui: change servicestatus letter color to default black, not grey #946
 * classic ui: fix waste of cpu in status summary (TomTom) #933
diff --git a/base/checks.c b/base/checks.c
index b2bc1f8..2fbbb3b 100644
--- a/base/checks.c
+++ b/base/checks.c
@@ -3996,10 +3996,11 @@ int process_host_check_result_3x(host *hst, int new_state, char *old_plugin_outp
 			schedule_host_check(hst,hst->next_check,CHECK_OPTION_NONE);
 		}
 
-		/* update host status */
-		update_host_status(hst,FALSE);
 	}
 
+	/* update host status - for both active (scheduled) and passive (non-scheduled) hosts */
+	update_host_status(hst,FALSE);
+
 	/* run async checks of all hosts we added above */
 	/* don't run a check if one is already executing or we can get by with a cached state */
 	for(hostlist_item=check_hostlist;hostlist_item!=NULL;hostlist_item=hostlist_item->next){