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

Make the 'name' attribute available in object definitions

Browse Source 
fixes #7538
This commit is contained in:
Gunnar Beutner 2014-11-01 06:39:21 +01:00
parent d300ceaaf7
commit db3887d09e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/config/configitem.cpp
View File

@ -126,12 +126,16 @@ Dictionary::Ptr ConfigItem::GetProperties(void)
ObjectLock olock(this); ObjectLock olock(this);
if (!m_Properties) { if (!m_Properties) {
Dictionary::Ptr locals = make_shared<Dictionary>();
locals->Set("__parent", m_Scope);
locals->Set("name", m_Name);
DebugHint dhint; DebugHint dhint;
m_Properties = make_shared<Dictionary>(); m_Properties = make_shared<Dictionary>();
m_Properties->Set("type", m_Type); m_Properties->Set("type", m_Type);
if (!m_Zone.IsEmpty()) if (!m_Zone.IsEmpty())
m_Properties->Set("zone", m_Zone); m_Properties->Set("zone", m_Zone);
m_Properties->Set("__parent", m_Scope); m_Properties->Set("__parent", locals);
GetExpressionList()->Evaluate(m_Properties, &dhint); GetExpressionList()->Evaluate(m_Properties, &dhint);
m_Properties->Remove("__parent"); m_Properties->Remove("__parent");
m_DebugHints = dhint.ToDictionary(); m_DebugHints = dhint.ToDictionary();