From b4946bc46dc5c2ae42cb7911eb518ea97134c713 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 20 Aug 2018 19:43:51 +0200
Subject: [PATCH] Better consolidation message

---
 src/blackcore/db/backgrounddataupdater.cpp | 13 +++++++++----
 src/blackcore/db/databaseutils.cpp         |  2 +-
 src/blackcore/db/modeldatareader.cpp       |  5 +++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/blackcore/db/backgrounddataupdater.cpp b/src/blackcore/db/backgrounddataupdater.cpp
index 299a61023..a99b38e58 100644
--- a/src/blackcore/db/backgrounddataupdater.cpp
+++ b/src/blackcore/db/backgrounddataupdater.cpp
@@ -16,6 +16,7 @@
 #include "blackmisc/threadutils.h"
 #include "blackmisc/eventloop.h"
 #include "blackmisc/logmessage.h"
+#include <QTime>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
@@ -115,7 +116,8 @@ namespace BlackCore
             const QDateTime dbModelsLatestSync = m_syncedModelsLatestChange.value(modelCaches.getDescription());
             if (dbModelsLatestSync.isValid() && latestDbModelsTs <= dbModelsLatestSync) { return; }
 
-            m_syncedModelsLatestChange[modelCaches.getDescription()] = latestDbModelsTs;
+            const QString description = modelCaches.getDescription();
+            m_syncedModelsLatestChange[description] = latestDbModelsTs;
             const CSimulatorInfo simulators = modelCaches.simulatorsWithInitializedCache(); // simulators ever used
             if (simulators.isNoSimulator()) { return; }
 
@@ -124,11 +126,13 @@ namespace BlackCore
                                                 dbModelsConsidered;
             if (dbModels.isEmpty()) { return; }
             const QSet<CSimulatorInfo> simulatorsSet = simulators.asSingleSimulatorSet();
+            QTime time;
             for (const CSimulatorInfo &singleSimulator : simulatorsSet)
             {
                 if (!this->doWorkCheck()) { return; }
                 CAircraftModelList simulatorModels = modelCaches.getSynchronizedCachedModels(singleSimulator);
                 if (simulatorModels.isEmpty()) { continue; }
+                time.restart();
                 const CAircraftModelList dbModelsForSimulator = dbModels.matchesSimulator(singleSimulator);
                 if (dbModelsForSimulator.isEmpty()) { continue; }
 
@@ -136,8 +140,9 @@ namespace BlackCore
                 const int c = CDatabaseUtils::consolidateModelsWithDbData(dbModelsForSimulator, simulatorModels, true);
                 if (c > 0)
                 {
-                    this->addHistory(CLogMessage(this).info("Consolidated %1 models for '%2'") << c << singleSimulator.convertToQString());
                     const CStatusMessage m = modelCaches.setCachedModels(simulatorModels, singleSimulator);
+                    const int msElapsed = time.elapsed();
+                    this->addHistory(CLogMessage(this).info("Consolidated %1 models (%2) for '%3' in %4ms") << c << description << singleSimulator.convertToQString() << msElapsed);
                     CLogMessage::preformatted(m);
                     this->addHistory(m);
                 }
@@ -168,11 +173,11 @@ namespace BlackCore
             if (!latestDbTs.isValid()) { return; }
             if (latestDbTs <= latestCacheTs)
             {
-                this->addHistory(CLogMessage(this).info("No auto sync with DB, entity '%1', DB ts: %2 cache ts: %3") << entityStr << latestDbTs.toString(Qt::ISODate) << latestCacheTsStr);
+                this->addHistory(CLogMessage(this).info("Background updater, no auto sync with DB, entity '%1', DB ts: %2 cache ts: %3") << entityStr << latestDbTs.toString(Qt::ISODate) << latestCacheTsStr);
                 return;
             }
 
-            this->addHistory(CLogMessage(this).info("Triggering read of '%1' since '%2'") << entityStr << latestCacheTsStr);
+            this->addHistory(CLogMessage(this).info("Background updater triggering read of '%1' since '%2'") << entityStr << latestCacheTsStr);
             sApp->getWebDataServices()->triggerLoadingDirectlyFromDb(entity, latestCacheTs);
         }
 
diff --git a/src/blackcore/db/databaseutils.cpp b/src/blackcore/db/databaseutils.cpp
index 6f88b5753..2d7afcd3d 100644
--- a/src/blackcore/db/databaseutils.cpp
+++ b/src/blackcore/db/databaseutils.cpp
@@ -200,7 +200,7 @@ namespace BlackCore
                     if (processEvents && c % 125 == 0) { sApp->processEventsFor(25); }
                 }
             }
-            CLogMessage(static_cast<CDatabaseUtils *>(nullptr)).info("Consolidated %1 models in %2 ms") << models.size() << timer.elapsed();
+            CLogMessage(static_cast<CDatabaseUtils *>(nullptr)).info("Consolidated %1 models in %2ms") << models.size() << timer.elapsed();
             return c;
         }
 
diff --git a/src/blackcore/db/modeldatareader.cpp b/src/blackcore/db/modeldatareader.cpp
index e86e222ac..b73dd2fae 100644
--- a/src/blackcore/db/modeldatareader.cpp
+++ b/src/blackcore/db/modeldatareader.cpp
@@ -391,7 +391,8 @@ namespace BlackCore
                 QTime time;
                 time.start();
                 models = CAircraftModelList::fromDatabaseJson(res);
-                CLogMessage(this).info("Parsed %1 models in %2 ms") << models.size() << time.elapsed();
+                const int elapsed = time.elapsed();
+                CLogMessage(this).info("Parsed %1 models in %2 ms") << models.size() << elapsed;
             }
 
             // synchronized update
@@ -419,7 +420,7 @@ namespace BlackCore
             }
 
             whatToRead &= CEntityFlags::DistributorLiveryModel; // supported
-            BlackMisc::Network::CEntityFlags::Entity reallyRead = CEntityFlags::NoEntity;
+            CEntityFlags::Entity reallyRead = CEntityFlags::NoEntity;
 
             CStatusMessageList msgs;
             if (whatToRead.testFlag(CEntityFlags::LiveryEntity))