From 5aaf5cdeb1c82ba31c098d4a26b8c18123fc945f Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 19 Jun 2017 18:41:23 +0200
Subject: [PATCH] Improved log messages and some typos fixed in DB reader

---
 src/blackcore/db/databasereader.cpp | 14 ++++++++++++--
 src/blackmisc/db/dbflags.h          |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp
index 654d5f003..70e0e34af 100644
--- a/src/blackcore/db/databasereader.cpp
+++ b/src/blackcore/db/databasereader.cpp
@@ -51,7 +51,7 @@ namespace BlackCore
         {
             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");
             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;
@@ -63,6 +63,8 @@ namespace BlackCore
                 const CDatabaseReaderConfig config(this->getConfigForEntity(currentEntity));
                 const QString currentEntityName = CEntityFlags::flagToString(currentEntity);
                 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");
                 if (rm.testFlag(CDbFlags::Ignore) || rm.testFlag(CDbFlags::Canceled))
                 {
@@ -70,6 +72,7 @@ namespace BlackCore
                 }
                 else if (rm.testFlag(CDbFlags::Cached))
                 {
+                    // cache + shared or DB data
                     if (hasInfoObjects)
                     {
                         const bool changedUrl = this->hasChangedUrl(currentEntity);
@@ -101,7 +104,14 @@ namespace BlackCore
                     {
                         // no info objects, server down or no info objects loaded
                         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
                     }
                 }
diff --git a/src/blackmisc/db/dbflags.h b/src/blackmisc/db/dbflags.h
index c9d89f288..ccf3d6ac3 100644
--- a/src/blackmisc/db/dbflags.h
+++ b/src/blackmisc/db/dbflags.h
@@ -54,7 +54,7 @@ namespace BlackMisc
             //! Convert to string
             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);
 
             //! Register metadata