]> granicus.if.org Git - icinga2/commitdiff
Evaluate object rules (group assign) before and after creating objects with apply...
authorMichael Friedrich <Michael.Friedrich@netways.de>
Thu, 1 May 2014 21:51:42 +0000 (23:51 +0200)
committerMichael Friedrich <Michael.Friedrich@netways.de>
Thu, 1 May 2014 21:51:42 +0000 (23:51 +0200)
Refs #6105

lib/config/configitem.cpp

index 28bf248c9373604e3ae2364c05193c6edb3ffb94..d236fa807eee1fbdbdae9de0d5e1346b0f470766 100644 (file)
@@ -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)...");