tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9779 from Icinga/macroprocessor-resolvemacro-quasi-cv-object-icingaapplication 

MacroProcessor::ResolveMacro(): treat quasi-CV-object IcingaApplication as real CV-object
This commit is contained in:
Julian Brost 2023-05-31 20:41:31 +02:00 committed by GitHub
parent e2bfd21bae a9c80ffb2e
commit 7c381ae12f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/icinga/icingaapplication.cpp
View File

@ -220,13 +220,6 @@ bool IcingaApplication::ResolveMacro(const String& macro, const CheckResult::Ptr
return true; return true;
} }
Dictionary::Ptr vars = GetVars();
if (vars && vars->Contains(macro)) {
*result = vars->Get(macro);
return true;
}
if (macro.Contains("num_services")) { if (macro.Contains("num_services")) {
ServiceStatistics ss = CIB::CalculateServiceStats(); ServiceStatistics ss = CIB::CalculateServiceStats();

17
lib/icinga/macroprocessor.cpp
View File

@ -111,17 +111,24 @@ bool MacroProcessor::ResolveMacro(const String& macro, const ResolverList& resol
if (!resolver.ResolveShortMacros) if (!resolver.ResolveShortMacros)
continue; continue;
Dictionary::Ptr vars;
CustomVarObject::Ptr dobj = dynamic_pointer_cast<CustomVarObject>(resolver.Obj); CustomVarObject::Ptr dobj = dynamic_pointer_cast<CustomVarObject>(resolver.Obj);
if (dobj) { if (dobj) {
Dictionary::Ptr vars = dobj->GetVars(); vars = dobj->GetVars();
} else {
auto app (dynamic_pointer_cast<IcingaApplication>(resolver.Obj));
if (vars && vars->Contains(macro)) { if (app) {
*result = vars->Get(macro); vars = app->GetVars();
*recursive_macro = true;
return true;
} }
} }
if (vars && vars->Contains(macro)) {
*result = vars->Get(macro);
*recursive_macro = true;
return true;
}
} }
auto *mresolver = dynamic_cast<MacroResolver *>(resolver.Obj.get()); auto *mresolver = dynamic_cast<MacroResolver *>(resolver.Obj.get());