tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Logs: Change config sync update to highlight an information, not an error 

fixes #5484
This commit is contained in:
Michael Friedrich 2017-09-08 13:28:11 +02:00
parent fc3d8636d4
commit f204f12935
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/remote/apilistener-filesync.cpp
View File

@ -100,10 +100,11 @@ bool ApiListener::UpdateConfigDir(const ConfigDirInformation& oldConfigInfo, con
/* skip update if our configuration files are more recent */ /* skip update if our configuration files are more recent */
if (oldTimestamp >= newTimestamp) { if (oldTimestamp >= newTimestamp) {
Log(LogInformation, "ApiListener") 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) << "' (" << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", oldTimestamp) << "' ("
<< std::fixed << std::setprecision(6) << 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) << "' (" << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", newTimestamp) << "' ("
<< newTimestamp << ")."; << newTimestamp << ").";
return false; return false;