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

Fix constant value for zone var override

This commit is contained in:
Michael Friedrich 2018-09-27 20:13:54 +02:00
parent e3e68caaa3
commit a91bbe8acd
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cli/daemonutility.cpp
View File

@ -152,10 +152,11 @@ bool DaemonUtility::ValidateConfigFiles(const std::vector<std::string>& configs,
if (systemNS->Contains("ZonesStageVarDir")) {
zonesVarDir = systemNS->Get("ZonesStageVarDir");
Log(LogDebug, "DaemonUtility")
Log(LogInformation, "DaemonUtility")
<< "Overriding zones var directory with '" << zonesVarDir << "' for cluster config sync staging.";
}
if (Utility::PathExists(zonesVarDir))
Utility::Glob(zonesVarDir + "/*", std::bind(&IncludeNonLocalZone, _1, "_cluster", std::ref(success)), GlobDirectory);

2
lib/remote/apilistener-filesync.cpp
View File

@ -410,7 +410,7 @@ void ApiListener::AsyncTryActivateZonesStage(const String& stageConfigDir, const
args->Add("--validate");
args->Add("--define");
args->Add("System.ZonesStageVarDir='" + GetApiZonesStageDir() + "'");
args->Add("System.ZonesStageVarDir=" + GetApiZonesStageDir());
Process::Ptr process = new Process(Process::PrepareCommand(args));
process->SetTimeout(300);