]> granicus.if.org Git - icinga2/commitdiff
Logs: Change config sync update to highlight an information, not an error 5566/head
authorMichael Friedrich <michael.friedrich@icinga.com>
Fri, 8 Sep 2017 11:28:11 +0000 (13:28 +0200)
committerMichael Friedrich <michael.friedrich@icinga.com>
Fri, 8 Sep 2017 11:28:11 +0000 (13:28 +0200)
fixes #5484

lib/remote/apilistener-filesync.cpp

index 84c443ba7dbf53a56c1987225f4e2e645843d2a9..926d4c336530081b738acce6dd321415031c8ed5 100644 (file)
@@ -100,10 +100,11 @@ bool ApiListener::UpdateConfigDir(const ConfigDirInformation& oldConfigInfo, con
        /* skip update if our configuration files are more recent */
        if (oldTimestamp >= newTimestamp) {
                Log(LogInformation, "ApiListener")
-                   << "Cannot apply configuration file update for path '" << configDir << "'. Current timestamp '"
+                   << "Our configuration is more recent than the received configuration update."
+                   << " Ignoring configuration file update for path '" << configDir << "'. Current timestamp '"
                    << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", oldTimestamp) << "' ("
                    << std::fixed << std::setprecision(6) << oldTimestamp
-                   << ") is more recent than received timestamp '"
+                   << ") >= received timestamp '"
                    << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", newTimestamp) << "' ("
                    << newTimestamp << ").";
                return false;