Build dependant services using extracted expression lists.

diff --git a/lib/config/expression.cpp b/lib/config/expression.cpp
index d411fada1bb3f2e7f1701dec8b0658de05b564cc..3a240a770685c73828b08578fc346ad258553954 100644 (file)
--- a/lib/config/expression.cpp
+++ b/lib/config/expression.cpp
@@ -220,10 +220,18 @@ void Expression::Extract(const std::vector<String>& path, const ExpressionList::
        ASSERT(!path.empty());
 
        if (path[0] == m_Key) {
-               if (path.size() > 1)
-                       BOOST_THROW_EXCEPTION(std::invalid_argument("Specified path does not exist."));
-               else
+               if (path.size() == 1) {
                        result->AddExpression(*this);
+
+                       return;
+               }
+
+               if (!m_Value.IsObjectType<ExpressionList>())
+                       BOOST_THROW_EXCEPTION(std::invalid_argument("Specified path does not exist."));
+
+               ExpressionList::Ptr exprl = m_Value;
+               std::vector<String> sub_path(path.begin() + 1, path.end());
+               exprl->Extract(sub_path, result);
        } else if (m_Operator == OperatorExecute) {
                ExpressionList::Ptr exprl = m_Value;
                exprl->Extract(path, result);

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 5ad3460369121b5cb21df0f04ee8200a41097e2a..b9253969042c2ff1adf54cc11c6395c82e38a3b0 100644 (file)
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -251,10 +251,18 @@ void Host::UpdateSlaveServices(void)
                        builder->AddExpression("display_name", OperatorSet, svcname);
                        builder->AddExpression("short_name", OperatorSet, svcname);
 
-                       CopyServiceAttributes<false>(this, builder);
+                       std::vector<String> path;
+                       path.push_back("services");
+                       path.push_back(svcname);
+
+                       ExpressionList::Ptr exprl = boost::make_shared<ExpressionList>();
+                       item->GetLinkedExpressionList()->Extract(path, exprl);
+                       builder->AddExpressionList(exprl);
+
+                       /*CopyServiceAttributes<false>(this, builder);
 
                        if (!svcdesc.IsObjectType<Dictionary>())
-                               BOOST_THROW_EXCEPTION(std::invalid_argument("Service description must be either a string or a dictionary."));
+                               BOOST_THROW_EXCEPTION(std::invalid_argument("Service description must be either a string or a dictionary."));*/
 
                        Dictionary::Ptr service = svcdesc;
 
@@ -268,7 +276,7 @@ void Host::UpdateSlaveServices(void)
                                }
                        }
 
-                       CopyServiceAttributes<true>(service, builder);
+                       //CopyServiceAttributes<true>(service, builder);
 
                        ConfigItem::Ptr serviceItem = builder->Compile();
                        DynamicObject::Ptr dobj = serviceItem->Commit();