tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 05:34:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed global macros.

Browse Source
This commit is contained in:
Gunnar Beutner 2012-07-13 11:40:57 +02:00
parent 530819d658
commit a17c614d96
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/convenience/conveniencecomponent.cpp
View File

@ -56,7 +56,10 @@ void ConvenienceComponent::HostAddedHandler(const ConfigItem::Ptr& item)
void ConvenienceComponent::CopyServiceAttributes(const ConfigObject::Ptr& host, const Dictionary::Ptr& service, const ConfigItemBuilder::Ptr& builder) void ConvenienceComponent::CopyServiceAttributes(const ConfigObject::Ptr& host, const Dictionary::Ptr& service, const ConfigItemBuilder::Ptr& builder)
{ {
Dictionary::Ptr macros; /* TODO: we only need to copy macros if this is an inline definition,
* i.e. host->GetProperties() != service, however for now we just
* copy them anyway. */
Dictionary::Ptr macros;
if (service->Get("macros", &macros)) if (service->Get("macros", &macros))
builder->AddExpression("macros", OperatorPlus, macros); builder->AddExpression("macros", OperatorPlus, macros);