From 05b5971caf1fb39219655ec3cd087bb18a3c5554 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Wed, 18 May 2016 17:50:29 +0100 Subject: [PATCH] refs #646 Log messages when saving and loading data cache values. --- src/blackmisc/datacache.cpp | 8 ++++++-- src/blackmisc/range.h | 7 +++++++ src/blackmisc/valuecache.cpp | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/blackmisc/datacache.cpp b/src/blackmisc/datacache.cpp index dc97f9432..cb6685930 100644 --- a/src/blackmisc/datacache.cpp +++ b/src/blackmisc/datacache.cpp @@ -234,7 +234,9 @@ namespace BlackMisc if (! lock) { return; } m_cache->m_revision.writeNewRevision(baseline.toTimestampMap()); - m_cache->saveToFiles(persistentStore(), values); + auto msg = m_cache->saveToFiles(persistentStore(), values); + msg.setCategories(this); + CLogMessage::preformatted(msg); applyDeferredChanges(); // apply changes which we grabbed at the last minute above } @@ -245,7 +247,9 @@ namespace BlackMisc if (lock && m_cache->m_revision.isPendingRead()) { CValueCachePacket newValues; - m_cache->loadFromFiles(persistentStore(), m_cache->m_revision.keysWithNewerTimestamps(), baseline.toVariantMap(), newValues); + auto msg = m_cache->loadFromFiles(persistentStore(), m_cache->m_revision.keysWithNewerTimestamps(), baseline.toVariantMap(), newValues); + msg.setCategories(this); + CLogMessage::preformatted(msg); m_deferredChanges.insert(newValues); } diff --git a/src/blackmisc/range.h b/src/blackmisc/range.h index a234b6917..a7a2fc51f 100644 --- a/src/blackmisc/range.h +++ b/src/blackmisc/range.h @@ -192,6 +192,13 @@ namespace BlackMisc //! Implicit conversion to any container of value_type which supports push_back. This will copy elements. template ::value>> operator T() const + { + return to(); + } + + //! Explicit conversion to any container of value_type which supports push_back. This will copy elements. + template + T to() const { T container; std::copy(begin(), end(), std::back_inserter(container)); diff --git a/src/blackmisc/valuecache.cpp b/src/blackmisc/valuecache.cpp index a49885427..c3215dbdd 100644 --- a/src/blackmisc/valuecache.cpp +++ b/src/blackmisc/valuecache.cpp @@ -304,7 +304,7 @@ namespace BlackMisc } } return CStatusMessage(this, CStatusMessage::SeverityInfo, - QString("Written %1 files for value cache in %2").arg(namespaces.size()).arg(dir)); + QString("Written %1 to value cache in %2").arg(values.keys().to().join(",")).arg(dir)); } CStatusMessage CValueCache::loadFromFiles(const QString &dir) @@ -347,7 +347,7 @@ namespace BlackMisc o_values.insert(temp, QFileInfo(file).lastModified().toMSecsSinceEpoch()); } return CStatusMessage(this, CStatusMessage::SeverityInfo, - QString("Loaded value cache from %1 files in %2").arg(entries.size()).arg(dir)); + QString("Loaded cache values %1 from %2").arg(o_values.keys().to().join(",")).arg(dir)); } void CValueCache::markAllAsSaved(const QString &keyPrefix)