From: Michael Friedrich <Michael.Friedrich@netways.de>
Date: Thu, 1 May 2014 21:51:42 +0000 (+0200)
Subject: Evaluate object rules (group assign) before and after creating objects with apply... 
X-Git-Tag: v0.0.11~101^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c2dae1804614a5f8b68ec6603d7623b98ab8708;p=icinga2

Evaluate object rules (group assign) before and after creating objects with apply rules.

Refs #6105
---

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 28bf248c9..d236fa807 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -316,10 +316,13 @@ bool ConfigItem::ValidateItems(void)
 
 	upq.Join();
 
+	Log(LogInformation, "config", "Evaluating 'object' rules (step 1)...");
+	ObjectRule::EvaluateRules();
+
 	Log(LogInformation, "config", "Evaluating 'apply' rules...");
 	ApplyRule::EvaluateRules();
 
-	Log(LogInformation, "config", "Evaluating 'object' rules...");
+	Log(LogInformation, "config", "Evaluating 'object' rules (step 2)...");
 	ObjectRule::EvaluateRules();
 
 	Log(LogInformation, "config", "Validating config items (step 2)...");