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

Fix config validation problem (startup.log) during /v1/config/stages API call

Browse Source 
copy all arguments of parent process in AsyncTryActivateStage
This commit is contained in:
Thomas Forrer 2018-08-22 14:47:57 +02:00 committed by Michael Friedrich
parent fbf4546357
commit 816cae98fa
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/remote/configpackageutility.cpp
View File

@ -217,12 +217,17 @@ void ConfigPackageUtility::AsyncTryActivateStage(const String& packageName, cons
// prepare arguments // prepare arguments
Array::Ptr args = new Array({ Array::Ptr args = new Array({
Application::GetExePath(Application::GetArgV()[0]), Application::GetExePath(Application::GetArgV()[0]),
"daemon",
"--validate",
"--define",
"ActiveStageOverride=" + packageName + ":" + stageName
}); });
// copy all arguments of parent process
for (int i=1; i < Application::GetArgC(); i++) {
args->Add(Application::GetArgV()[i]);
}
// add arguments for validation
args->Add("--validate");
args->Add("--define");
args->Add("ActiveStageOverride=" + packageName + ":" + stageName);
Process::Ptr process = new Process(Process::PrepareCommand(args)); Process::Ptr process = new Process(Process::PrepareCommand(args));
process->SetTimeout(300); process->SetTimeout(300);
process->Run(std::bind(&TryActivateStageCallback, _1, packageName, stageName, reload)); process->Run(std::bind(&TryActivateStageCallback, _1, packageName, stageName, reload));