Log "Loading …" message when reloading DBs also without force-flag

This commit is contained in:
Martchus 2022-11-01 14:35:00 +01:00
parent a205ffae38
commit 809bafa6ee
1 changed files with 6 additions and 2 deletions

View File

@ -132,9 +132,12 @@ void queryDatabases(LogContext &log, ServiceSetup &setup, std::vector<DatabaseQu
// log/skip // log/skip
auto lastModified = parseLastModified(log, message, dbName, dbArch); auto lastModified = parseLastModified(log, message, dbName, dbArch);
auto loadingLogged = false;
if (lastModified.isNull()) { if (lastModified.isNull()) {
log(Phrases::InfoMessage, "Loading database \"", dbName, '@', dbArch, "\" from mirror response\n"); log(Phrases::InfoMessage, "Loading database \"", dbName, '@', dbArch,
"\" from mirror response; assuming last modification time to be now\n");
lastModified = DateTime::gmtNow(); lastModified = DateTime::gmtNow();
loadingLogged = true;
} else if (!force) { } else if (!force) {
auto configReadLock = setup.config.lockToRead(); auto configReadLock = setup.config.lockToRead();
if (auto *const destinationDb = setup.config.findDatabase(dbName, dbArch)) { if (auto *const destinationDb = setup.config.findDatabase(dbName, dbArch)) {
@ -146,7 +149,8 @@ void queryDatabases(LogContext &log, ServiceSetup &setup, std::vector<DatabaseQu
return; return;
} }
} }
} else { }
if (!loadingLogged) {
log(Phrases::InfoMessage, "Loading database \"", dbName, '@', dbArch, log(Phrases::InfoMessage, "Loading database \"", dbName, '@', dbArch,
"\" from mirror response; last modification time: ", lastModified.toString(), '\n'); "\" from mirror response; last modification time: ", lastModified.toString(), '\n');
} }