Service: be handled while host is down

[icinga2] / lib / icinga / dependency-apply.cpp

diff --git a/lib/icinga/dependency-apply.cpp b/lib/icinga/dependency-apply.cpp
index 7bf67b929e11c11172d66c81cd7ea157d3fa9c8f..0f8eddc5b75ffa13192cc661a05836f753265a76 100644 (file)
--- a/lib/icinga/dependency-apply.cpp
+++ b/lib/icinga/dependency-apply.cpp
@@ -1,21 +1,4 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)  *
- *                                                                            *
- * This program is free software; you can redistribute it and/or              *
- * modify it under the terms of the GNU General Public License                *
- * as published by the Free Software Foundation; either version 2             *
- * of the License, or (at your option) any later version.                     *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program; if not, write to the Free Software Foundation     *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
- ******************************************************************************/
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 #include "icinga/dependency.hpp"
 #include "icinga/service.hpp"
@@ -31,10 +14,7 @@
 using namespace icinga;
 
 INITIALIZE_ONCE([]() {
-       std::vector<String> targets;
-       targets.push_back("Host");
-       targets.push_back("Service");
-       ApplyRule::RegisterType("Dependency", targets);
+       ApplyRule::RegisterType("Dependency", { "Host", "Service" });
 });
 
 bool Dependency::EvaluateApplyRuleInstance(const Checkable::Ptr& checkable, const String& name, ScriptFrame& frame, const ApplyRule& rule)
@@ -49,34 +29,34 @@ bool Dependency::EvaluateApplyRuleInstance(const Checkable::Ptr& checkable, cons
                << "Applying dependency '" << name << "' to object '" << checkable->GetName() << "' for rule " << di;
 #endif /* _DEBUG */
 
-       ConfigItemBuilder::Ptr builder = new ConfigItemBuilder(di);
-       builder->SetType("Dependency");
-       builder->SetName(name);
-       builder->SetScope(frame.Locals->ShallowClone());
-       builder->SetIgnoreOnError(rule.GetIgnoreOnError());
+       ConfigItemBuilder builder{di};
+       builder.SetType(Dependency::TypeInstance);
+       builder.SetName(name);
+       builder.SetScope(frame.Locals->ShallowClone());
+       builder.SetIgnoreOnError(rule.GetIgnoreOnError());
 
        Host::Ptr host;
        Service::Ptr service;
        tie(host, service) = GetHostService(checkable);
 
-       builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "parent_host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
-       builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "child_host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
+       builder.AddExpression(new SetExpression(MakeIndexer(ScopeThis, "parent_host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
+       builder.AddExpression(new SetExpression(MakeIndexer(ScopeThis, "child_host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
 
        if (service)
-               builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "child_service_name"), OpSetLiteral, MakeLiteral(service->GetShortName()), di));
+               builder.AddExpression(new SetExpression(MakeIndexer(ScopeThis, "child_service_name"), OpSetLiteral, MakeLiteral(service->GetShortName()), di));
 
        String zone = checkable->GetZoneName();
 
        if (!zone.IsEmpty())
-               builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "zone"), OpSetLiteral, MakeLiteral(zone), di));
+               builder.AddExpression(new SetExpression(MakeIndexer(ScopeThis, "zone"), OpSetLiteral, MakeLiteral(zone), di));
 
-       builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "package"), OpSetLiteral, MakeLiteral(rule.GetPackage()), di));
+       builder.AddExpression(new SetExpression(MakeIndexer(ScopeThis, "package"), OpSetLiteral, MakeLiteral(rule.GetPackage()), di));
 
-       builder->AddExpression(new ImportDefaultTemplatesExpression());
+       builder.AddExpression(new ImportDefaultTemplatesExpression());
 
-       builder->AddExpression(new OwnedExpression(rule.GetExpression()));
+       builder.AddExpression(new OwnedExpression(rule.GetExpression()));
 
-       ConfigItem::Ptr dependencyItem = builder->Compile();
+       ConfigItem::Ptr dependencyItem = builder.Compile();
        dependencyItem->Register();
 
        return true;
@@ -94,7 +74,7 @@ bool Dependency::EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyR
        Service::Ptr service;
        tie(host, service) = GetHostService(checkable);
 
-       ScriptFrame frame;
+       ScriptFrame frame(true);
        if (rule.GetScope())
                rule.GetScope()->CopyTo(frame.Locals);
        frame.Locals->Set("host", host);
@@ -111,9 +91,7 @@ bool Dependency::EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyR
                        return false;
                }
        } else {
-               Array::Ptr instances = new Array();
-               instances->Add("");
-               vinstances = instances;
+               vinstances = new Array({ "" });
        }
 
        bool match = false;
@@ -139,7 +117,7 @@ bool Dependency::EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyR
        } else if (vinstances.IsObjectType<Dictionary>()) {
                if (rule.GetFVVar().IsEmpty())
                        BOOST_THROW_EXCEPTION(ScriptError("Array iterator requires value to be an array.", di));
-       
+
                Dictionary::Ptr dict = vinstances;
 
                for (const String& key : dict->GetKeys()) {