Improve logging and code quality

diff --git a/lib/cli/daemonutility.cpp b/lib/cli/daemonutility.cpp
index 5508b148894391dc7e9f4223251222786c82c079..d5bb2cf1e962be0152185d86377113f5c5a07c13 100644 (file)
--- a/lib/cli/daemonutility.cpp
+++ b/lib/cli/daemonutility.cpp
@@ -145,14 +145,14 @@ bool DaemonUtility::ValidateConfigFiles(const std::vector<std::string>& configs,
        if (!success)
                return false;
 
-       /* Load cluster synchronized configuration files. This can be disabled for staged sync validations. */
+       /* Load cluster synchronized configuration files. This can be overridden for staged sync validations. */
        String zonesVarDir = Configuration::DataDir + "/api/zones";
 
        /* Cluster config sync stage validation needs this. */
        if (systemNS->Contains("ZonesStageVarDir")) {
                zonesVarDir = systemNS->Get("ZonesStageVarDir");
 
-               Log(LogInformation, "DaemonUtility")
+               Log(LogNotice, "DaemonUtility")
                        << "Overriding zones var directory with '" << zonesVarDir << "' for cluster config sync staging.";
        }
 

diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp
index f851153febb13ad2e12abd1ed12e8ae9a69986e8..4d83515727bfccb11dd15c1af4e1a28f06382994 100644 (file)
--- a/lib/remote/apilistener-filesync.cpp
+++ b/lib/remote/apilistener-filesync.cpp
@@ -342,7 +342,7 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
                /* Spawn a validation process. On success, move the staged configuration
                 * into production and restart.
                 */
-               AsyncTryActivateZonesStage(GetApiZonesStageDir(), GetApiZonesDir(), relativePaths, true);
+               AsyncTryActivateZonesStage(GetApiZonesStageDir(), GetApiZonesDir(), relativePaths);
        }
 
        return Empty;
@@ -350,7 +350,7 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
 
 void ApiListener::TryActivateZonesStageCallback(const ProcessResult& pr,
        const String& stageConfigDir, const String& currentConfigDir,
-       const std::vector<String>& relativePaths, bool reload)
+       const std::vector<String>& relativePaths)
 {
        String logFile = GetApiZonesStageDir() + "/startup.log";
        std::ofstream fpLog(logFile.CStr(), std::ofstream::out | std::ostream::binary | std::ostream::trunc);
@@ -365,12 +365,11 @@ void ApiListener::TryActivateZonesStageCallback(const ProcessResult& pr,
        /* validation went fine, copy stage and reload */
        if (pr.ExitStatus == 0) {
                Log(LogInformation, "ApiListener")
-                       << "Config validation for stage '" << GetApiZonesStageDir() << "' was OK, triggering reload.";
+                       << "Config validation for stage '" << GetApiZonesStageDir() << "' was OK, copying into '" << GetApiZonesDir() << "' and triggering reload.";
 
                for (const String& path : relativePaths) {
-                       /* TODO: Better error handling with existing files. */
-                       Log(LogCritical, "ApiListener")
-                               << "Copying file '" << path << "' from config sync staging to production directory.";
+                       Log(LogNotice, "ApiListener")
+                               << "Copying file '" << path << "' from config sync staging to production zones directory.";
 
                        String stagePath = GetApiZonesStageDir() + path;
                        String currentPath = GetApiZonesDir() + path;
@@ -380,12 +379,11 @@ void ApiListener::TryActivateZonesStageCallback(const ProcessResult& pr,
                        Utility::CopyFile(stagePath, currentPath);
                }
 
-               if (reload)
-                       Application::RequestRestart();
+               Application::RequestRestart();
        } else {
                Log(LogCritical, "ApiListener")
-                       << "Config validation failed for staged cluster config sync. Aborting. Logs: '"
-                       << logFile << "'";
+                       << "Config validation failed for staged cluster config sync in '" << GetApiZonesStageDir()
+                       << "'. Aborting. Logs: '" << logFile << "'";
 
                ApiListener::Ptr listener = ApiListener::GetInstance();
 
@@ -395,7 +393,7 @@ void ApiListener::TryActivateZonesStageCallback(const ProcessResult& pr,
 }
 
 void ApiListener::AsyncTryActivateZonesStage(const String& stageConfigDir, const String& currentConfigDir,
-       const std::vector<String>& relativePaths, bool reload)
+       const std::vector<String>& relativePaths)
 {
        VERIFY(Application::GetArgC() >= 1);
 
@@ -419,7 +417,7 @@ void ApiListener::AsyncTryActivateZonesStage(const String& stageConfigDir, const
 
        Process::Ptr process = new Process(Process::PrepareCommand(args));
        process->SetTimeout(300);
-       process->Run(std::bind(&TryActivateZonesStageCallback, _1, stageConfigDir, currentConfigDir, relativePaths, reload));
+       process->Run(std::bind(&TryActivateZonesStageCallback, _1, stageConfigDir, currentConfigDir, relativePaths));
 }
 
 void ApiListener::UpdateLastFailedZonesStageValidation(const String& log)

diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp
index 757de7e870918db080253064cbf3e502ab2aafd0..3be03f96d9cd29979e8124992865f2b441a8c9ee 100644 (file)
--- a/lib/remote/apilistener.hpp
+++ b/lib/remote/apilistener.hpp
@@ -183,9 +183,9 @@ private:
 
        static void TryActivateZonesStageCallback(const ProcessResult& pr,
                const String& stageConfigDir, const String& currentConfigDir,
-               const std::vector<String>& relativePaths, bool reload);
+               const std::vector<String>& relativePaths);
        static void AsyncTryActivateZonesStage(const String& stageConfigDir, const String& currentConfigDir,
-               const std::vector<String>& relativePaths, bool reload);
+               const std::vector<String>& relativePaths);
 
        void UpdateLastFailedZonesStageValidation(const String& log);