From bdbf2e75b479150bf6a7483f46ba5b4dbcef1c67 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 22 Sep 2017 23:07:50 +0200 Subject: [PATCH] Improved DB reader log messages --- src/blackcore/db/databasereader.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp index 929ede066..940bcb49d 100644 --- a/src/blackcore/db/databasereader.cpp +++ b/src/blackcore/db/databasereader.cpp @@ -68,6 +68,7 @@ namespace BlackCore const CDbFlags::DataRetrievalModeFlag rmDbOrSharedFlag = CDbFlags::modeToModeFlag(rm & CDbFlags::DbReadingOrShared); const QString rmDbOrSharedFlagString = CDbFlags::flagToString(rmDbOrSharedFlag); const bool rmDbReadingOrShared = (rmDbOrSharedFlag == CDbFlags::DbReading || rmDbOrSharedFlag == CDbFlags::Shared); + const int currentEntityCount = this->getCacheCount(currentEntity); if (rm.testFlag(CDbFlags::Ignore) || rm.testFlag(CDbFlags::Canceled)) { @@ -115,15 +116,26 @@ namespace BlackCore } else { - // no info objects, server down or no shared/db read mode - this->admitCaches(currentEntity); - if (!rmDbReadingOrShared) + if (!rmDbReadingOrShared) { CLogMessage(this).info("No DB or shared reading for '%1'") << currentEntityName; } + if (!hasInfoObjects) { CLogMessage(this).info("No info objects for '%1'") << currentEntityName; } + if (currentEntityCount > 0) { - CLogMessage(this).info("Triggered reading cache for '%1', read mode: %2") << currentEntityName << rmString; + CLogMessage(this).info("Cache for '%1' already read, %2 entries") << currentEntityName << currentEntityCount; } else { - CLogMessage(this).info("No info object for '%1', triggered reading cache, read mode: %2") << currentEntityName << rmString; + // no info objects, server down or no shared/db read mode + this->admitCaches(currentEntity); + if (!rmDbReadingOrShared) + { + // intentionally we do not want to read from DB/shared + CLogMessage(this).info("Triggered reading cache for '%1', read mode: %2") << currentEntityName << rmString; + } + else + { + // we want to read from DB/shared, but have no info object + CLogMessage(this).info("No info object for '%1', triggered reading cache, read mode: %2") << currentEntityName << rmString; + } } cachedEntities |= currentEntity; // read from cache }