[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: Revert " fix for event execution loop re-scheduling host checks instead of executing them if service checks are disabled (Ethan Galstad)"

git at icinga.org git at icinga.org
Tue Sep 14 09:11:07 CEST 2010


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Sep 14 09:10:41 2010 +0200

Revert "fix for event execution loop re-scheduling host checks instead of executing them if service checks are disabled (Ethan Galstad)"

This reverts commit 6190718164d2d8376b47d4a1686679a0fbe9bc8c.

Conflicts:

	Changelog

---

 Changelog     |    1 -
 base/events.c |    3 ---
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 93d838d..000bc44 100644
--- a/Changelog
+++ b/Changelog
@@ -21,7 +21,6 @@ ENHANCEMENTS
 FIXES
 * core: fix send comments to the broker with proper expiration_time (Matthieu Kermagoret)
 * core: fix segfault in escalation conditions when using object tricks (Vitali Voroth)
-* core: fix for event execution loop re-scheduling host checks instead of executing them if service checks are disabled (Ethan Galstad)
 * core: fix for retaining host display name and alias, as well as service display name (Folkert van Heusden)
 
 * classic ui: update jquery for multiple cmds dropdown, resolve conflicts with pnp
diff --git a/base/events.c b/base/events.c
index 6500871..8337e84 100644
--- a/base/events.c
+++ b/base/events.c
@@ -1234,9 +1234,6 @@ int event_execution_loop(void){
 
 			        }
 
-			/* reset flag */
-			run_event=TRUE;
-
 			/* run a few checks before executing a host check... */
 			if(event_list_low->event_type==EVENT_HOST_CHECK){
 





More information about the icinga-checkins mailing list