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

Fix formatting of long fn

This commit is contained in:
Benjamin Groeber 2020-06-23 11:41:49 +02:00
parent 159e3d2945
commit 2bb6f9d38d
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/icinga/apiactions.cpp
View File

@ -587,13 +587,11 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
useResolvedMacros = false; useResolvedMacros = false;
} }
String resolved_endpoint = MacroProcessor::ResolveMacros(endpoint, String resolved_endpoint = MacroProcessor::ResolveMacros(
resolvers, endpoint, resolvers, checkable->GetLastCheckResult(),
checkable->GetLastCheckResult(), nullptr, MacroProcessor::EscapeCallback(), resolvedMacros,
nullptr, useResolvedMacros
MacroProcessor::EscapeCallback(), );
resolvedMacros,
useResolvedMacros);
/* Check if resolved_endpoint is not empty */ /* Check if resolved_endpoint is not empty */
if (resolved_endpoint.IsEmpty()) if (resolved_endpoint.IsEmpty())
@ -627,13 +625,11 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
} }
/* Resolve command macro */ /* Resolve command macro */
String resolved_command = MacroProcessor::ResolveMacros(command, String resolved_command = MacroProcessor::ResolveMacros(
resolvers, command, resolvers, checkable->GetLastCheckResult(),
checkable->GetLastCheckResult(), nullptr, MacroProcessor::EscapeCallback(), resolvedMacros,
nullptr, useResolvedMacros
MacroProcessor::EscapeCallback(), );
resolvedMacros,
useResolvedMacros);
/* Check if resolved_command is not empty */ /* Check if resolved_command is not empty */
if (resolved_command.IsEmpty()) if (resolved_command.IsEmpty())
@ -735,4 +731,3 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
result->Set(checkable->GetName(), uuid); result->Set(checkable->GetName(), uuid);
return ApiActions::CreateResult(202, "Accepted", result); return ApiActions::CreateResult(202, "Accepted", result);
} }