]> granicus.if.org Git - icinga2/commitdiff
Fix constant value for zone var override
authorMichael Friedrich <michael.friedrich@icinga.com>
Thu, 27 Sep 2018 18:13:54 +0000 (20:13 +0200)
committerMichael Friedrich <michael.friedrich@icinga.com>
Wed, 19 Jun 2019 12:46:11 +0000 (14:46 +0200)
lib/cli/daemonutility.cpp
lib/remote/apilistener-filesync.cpp

index f5b436bda10ea959ee7eabe287bd47f0a04a16d6..5508b148894391dc7e9f4223251222786c82c079 100644 (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);
 
index 87f1be475599b774031c8902d3338e4577f49fb7..5de7df2992d1a8ff18c082c6fcd2dab9411ac066 100644 (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);