From a91bbe8acdb015b2c3942704e1152c153d467665 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 27 Sep 2018 20:13:54 +0200 Subject: [PATCH] Fix constant value for zone var override --- lib/cli/daemonutility.cpp | 3 ++- lib/remote/apilistener-filesync.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/cli/daemonutility.cpp b/lib/cli/daemonutility.cpp index f5b436bda..5508b1488 100644 --- a/lib/cli/daemonutility.cpp +++ b/lib/cli/daemonutility.cpp @@ -152,10 +152,11 @@ bool DaemonUtility::ValidateConfigFiles(const std::vector& 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); diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp index 87f1be475..5de7df299 100644 --- a/lib/remote/apilistener-filesync.cpp +++ b/lib/remote/apilistener-filesync.cpp @@ -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);