flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-16 10:25:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improved DB reader log messages

Browse Source
This commit is contained in:
Klaus Basan
2017-09-22 23:07:50 +02:00
committed by Mathew Sutcliffe
parent daaf895c3b
commit bdbf2e75b4
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackcore/db/databasereader.cpp
View File

@@ -68,6 +68,7 @@ namespace BlackCore
const CDbFlags::DataRetrievalModeFlag rmDbOrSharedFlag = CDbFlags::modeToModeFlag(rm & CDbFlags::DbReadingOrShared); const CDbFlags::DataRetrievalModeFlag rmDbOrSharedFlag = CDbFlags::modeToModeFlag(rm & CDbFlags::DbReadingOrShared);
const QString rmDbOrSharedFlagString = CDbFlags::flagToString(rmDbOrSharedFlag); const QString rmDbOrSharedFlagString = CDbFlags::flagToString(rmDbOrSharedFlag);
const bool rmDbReadingOrShared = (rmDbOrSharedFlag == CDbFlags::DbReading || rmDbOrSharedFlag == CDbFlags::Shared); const bool rmDbReadingOrShared = (rmDbOrSharedFlag == CDbFlags::DbReading || rmDbOrSharedFlag == CDbFlags::Shared);
const int currentEntityCount = this->getCacheCount(currentEntity);
if (rm.testFlag(CDbFlags::Ignore) || rm.testFlag(CDbFlags::Canceled)) if (rm.testFlag(CDbFlags::Ignore) || rm.testFlag(CDbFlags::Canceled))
{ {
@@ -115,15 +116,26 @@ namespace BlackCore
} }
else else
{ {
// no info objects, server down or no shared/db read mode if (!rmDbReadingOrShared) { CLogMessage(this).info("No DB or shared reading for '%1'") << currentEntityName; }
this->admitCaches(currentEntity); if (!hasInfoObjects) { CLogMessage(this).info("No info objects for '%1'") << currentEntityName; }
if (!rmDbReadingOrShared) 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 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 cachedEntities |= currentEntity; // read from cache
} }