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 #6503 from peteeckel/fix/reduce-loglevel-plugin-env-6460 

Reduce the log level for missing env macros to debug
This commit is contained in:
Michael Friedrich 2018-10-08 14:09:18 +02:00 committed by GitHub
parent f0411150bb b5a7af126d
commit 051b3ba9b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/icinga/pluginutility.cpp
View File

@ -70,10 +70,17 @@ void PluginUtility::ExecuteCommand(const Command::Ptr& commandObj, const Checkab
for (const Dictionary::Pair& kv : env) {
String name = kv.second;
String missingMacro;
Value value = MacroProcessor::ResolveMacros(name, macroResolvers, cr,
nullptr, MacroProcessor::EscapeCallback(), resolvedMacros,
&missingMacro, MacroProcessor::EscapeCallback(), resolvedMacros,
useResolvedMacros);
#ifdef I2_DEBUG
if (!missingMacro.IsEmpty())
Log(LogDebug, "PluginUtility")
<< "Macro '" << name << "' is not defined.";
#endif /* I2_DEBUG */
if (value.IsObjectType<Array>())
value = Utility::Join(value, ';');