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

Fix macros.

Browse Source 
Refs #5855
This commit is contained in:
Gunnar Beutner 2014-04-05 09:19:42 +02:00
parent c42a582307
commit 5ccdf017ac
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/icinga/host.cpp
View File

@ -369,13 +369,13 @@ bool Host::ResolveMacro(const String& macro, const CheckResult::Ptr&, String *re
return true;
}
}
}
Dictionary::Ptr vars = GetVars();
Dictionary::Ptr vars = GetVars();
if (vars && vars->Contains(key)) {
*result = vars->Get(key);
return true;
}
if (vars && vars->Contains(macro)) {
*result = vars->Get(macro);
return true;
}
return false;

11
lib/icinga/icingaapplication.cpp
View File

@ -156,12 +156,13 @@ bool IcingaApplication::ResolveMacro(const String& macro, const CheckResult::Ptr
return true;
}
Dictionary::Ptr vars = GetVars();
}
if (vars && vars->Contains(key)) {
*result = vars->Get(key);
return true;
}
Dictionary::Ptr vars = GetVars();
if (vars && vars->Contains(macro)) {
*result = vars->Get(macro);
return true;
}
return false;

10
lib/icinga/service.cpp
View File

@ -199,13 +199,13 @@ bool Service::ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Stri
return true;
}
}
}
Dictionary::Ptr vars = GetVars();
Dictionary::Ptr vars = GetVars();
if (vars && vars->Contains(key)) {
*result = vars->Get(key);
return true;
}
if (vars && vars->Contains(macro)) {
*result = vars->Get(macro);
return true;
}
return false;

10
lib/icinga/user.cpp
View File

@ -79,13 +79,13 @@ bool User::ResolveMacro(const String& macro, const CheckResult::Ptr&, String *re
*result = GetDisplayName();
return true;
}
}
Dictionary::Ptr vars = GetVars();
Dictionary::Ptr vars = GetVars();
if (vars && vars->Contains(key)) {
*result = vars->Get(key);
return true;
}
if (vars && vars->Contains(macro)) {
*result = vars->Get(macro);
return true;
}
return false;