From 9e17ff874bf9208d4cba05697b89d538efc0efc5 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 8 Sep 2017 13:28:11 +0200 Subject: [PATCH] Logs: Change config sync update to highlight an information, not an error fixes #5484 --- lib/remote/apilistener-filesync.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp index 84c443ba7..926d4c336 100644 --- a/lib/remote/apilistener-filesync.cpp +++ b/lib/remote/apilistener-filesync.cpp @@ -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;