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

Implement support for formatting arrays in macro strings

Browse Source 
fixes #7262
This commit is contained in:
Gunnar Beutner 2014-11-02 07:35:43 +01:00
parent 4677014b6d
commit 46b149dd7d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/icinga/macroprocessor.cpp
View File

@ -89,7 +89,12 @@ bool MacroProcessor::ResolveMacro(const String& macro, const ResolverList& resol
Dictionary::Ptr vars = dobj->GetVars(); Dictionary::Ptr vars = dobj->GetVars();
if (vars && vars->Contains(macro)) { if (vars && vars->Contains(macro)) {
*result = vars->Get(macro); Value value = vars->Get(macro);
if (value.IsObjectType<Array>())
value = Utility::Join(value, ';');
*result = value;
*recursive_macro = true; *recursive_macro = true;
return true; return true;
} }
@ -142,6 +147,9 @@ bool MacroProcessor::ResolveMacro(const String& macro, const ResolverList& resol
tokens[0] == "notes") tokens[0] == "notes")
*recursive_macro = true; *recursive_macro = true;
if (ref.IsObjectType<Array>())
ref = Utility::Join(ref, ';');
*result = ref; *result = ref;
return true; return true;
} }