[icinga-checkins] icinga.org: icinga2/master: Fix the load order for Host/ Service vs. Endpoint/Zone

git at icinga.org git at icinga.org
Sun Aug 14 23:05:34 CEST 2016


Module: icinga2
Branch: master
Commit: 8ced75b7d28a04fc107d9695e514367acf8c12f5
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=8ced75b7d28a04fc107d9695e514367acf8c12f5

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Sun Aug 14 23:03:28 2016 +0200

Fix the load order for Host/Service vs. Endpoint/Zone

refs #12432

---

 lib/icinga/checkable.ti |    4 ----
 lib/icinga/host.ti      |    4 ++++
 lib/icinga/service.ti   |    3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/icinga/checkable.ti b/lib/icinga/checkable.ti
index 81571f9..27a158d 100644
--- a/lib/icinga/checkable.ti
+++ b/lib/icinga/checkable.ti
@@ -44,10 +44,6 @@ enum AcknowledgementType
 
 abstract class Checkable : CustomVarObject
 {
-	load_after ApiListener;
-	load_after Endpoint;
-	load_after Zone;
-
 	[config, required, navigation] name(CheckCommand) check_command (CheckCommandRaw) {
 		navigate {{{
 			return CheckCommand::GetByName(GetCheckCommandRaw());
diff --git a/lib/icinga/host.ti b/lib/icinga/host.ti
index 10a583e..a80c61a 100644
--- a/lib/icinga/host.ti
+++ b/lib/icinga/host.ti
@@ -27,6 +27,10 @@ namespace icinga
 
 class Host : Checkable
 {
+	load_after ApiListener;
+	load_after Endpoint;
+	load_after Zone;
+
 	[config, no_user_modify] array(name(HostGroup)) groups {
 		default {{{ return new Array(); }}}
 	};
diff --git a/lib/icinga/service.ti b/lib/icinga/service.ti
index 16b9f1a..f016b92 100644
--- a/lib/icinga/service.ti
+++ b/lib/icinga/service.ti
@@ -38,7 +38,10 @@ public:
 
 class Service : Checkable < ServiceNameComposer
 {
+	load_after ApiListener;
+	load_after Endpoint;
 	load_after Host;
+	load_after Zone;
 
 	[config, no_user_modify] array(name(ServiceGroup)) groups {
 		default {{{ return new Array(); }}}



More information about the icinga-checkins mailing list