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

Improved log messages and some typos fixed in DB reader

Browse Source
This commit is contained in:
Klaus Basan
2017-06-19 18:41:23 +02:00
parent 5a40e86ecf
commit 5aaf5cdeb1
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ namespace BlackCore
{ {
if (this->isShuttingDown()) { return; } if (this->isShuttingDown()) { return; }
// we accept cached cached data // we accept cached data
Q_ASSERT_X(!entities.testFlag(CEntityFlags::DbInfoObjectEntity), Q_FUNC_INFO, "Read info objects directly"); Q_ASSERT_X(!entities.testFlag(CEntityFlags::DbInfoObjectEntity), Q_FUNC_INFO, "Read info objects directly");
const bool hasInfoObjects = this->hasDbInfoObjects(); // no info objects is not necessarily an error, but indicates a) either data not available (DB down) or b) only caches are used const bool hasInfoObjects = this->hasDbInfoObjects(); // no info objects is not necessarily an error, but indicates a) either data not available (DB down) or b) only caches are used
CEntityFlags::Entity allEntities = entities; CEntityFlags::Entity allEntities = entities;
@@ -63,6 +63,8 @@ namespace BlackCore
const CDatabaseReaderConfig config(this->getConfigForEntity(currentEntity)); const CDatabaseReaderConfig config(this->getConfigForEntity(currentEntity));
const QString currentEntityName = CEntityFlags::flagToString(currentEntity); const QString currentEntityName = CEntityFlags::flagToString(currentEntity);
const CDbFlags::DataRetrievalMode rm = config.getRetrievalMode(); const CDbFlags::DataRetrievalMode rm = config.getRetrievalMode();
const QString rmString = CDbFlags::flagToString(rm);
const bool rmCacheOnly = (rm == CDbFlags::Cached);
Q_ASSERT_X(!rm.testFlag(CDbFlags::Unspecified), Q_FUNC_INFO, "Missing retrieval mode"); Q_ASSERT_X(!rm.testFlag(CDbFlags::Unspecified), Q_FUNC_INFO, "Missing retrieval mode");
if (rm.testFlag(CDbFlags::Ignore) || rm.testFlag(CDbFlags::Canceled)) if (rm.testFlag(CDbFlags::Ignore) || rm.testFlag(CDbFlags::Canceled))
{ {
@@ -70,6 +72,7 @@ namespace BlackCore
} }
else if (rm.testFlag(CDbFlags::Cached)) else if (rm.testFlag(CDbFlags::Cached))
{ {
// cache + shared or DB data
if (hasInfoObjects) if (hasInfoObjects)
{ {
const bool changedUrl = this->hasChangedUrl(currentEntity); const bool changedUrl = this->hasChangedUrl(currentEntity);
@@ -101,7 +104,14 @@ namespace BlackCore
{ {
// no info objects, server down or no info objects loaded // no info objects, server down or no info objects loaded
this->admitCaches(currentEntity); this->admitCaches(currentEntity);
CLogMessage(this).info("No info object for %1, triggered reading cache") << currentEntityName; if (rmCacheOnly)
{
CLogMessage(this).info("Triggered reading cache (cache only flag)") << currentEntityName;
}
else
{
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
} }
} }

2
src/blackmisc/db/dbflags.h
View File

@@ -54,7 +54,7 @@ namespace BlackMisc
//! Convert to string //! Convert to string
static QString flagToString(CDbFlags::DataRetrievalMode mode); static QString flagToString(CDbFlags::DataRetrievalMode mode);
//! Adjust flag as we alread know DB is down //! Adjust flag as we already know DB is down
static DataRetrievalMode adjustWhenDbIsDown(DataRetrievalMode mode); static DataRetrievalMode adjustWhenDbIsDown(DataRetrievalMode mode);
//! Register metadata //! Register metadata