From 279c3fd398546eb6ed8cfb950b040e47a36e6711 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 6 Mar 2017 15:10:47 +0100
Subject: Index debug output

---
 common/index.cpp | 16 ++++++++--------
 common/index.h   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/index.cpp b/common/index.cpp
index f09e265..725c28b 100644
--- a/common/index.cpp
+++ b/common/index.cpp
@@ -2,31 +2,31 @@
 
 #include "log.h"
 
-SINK_DEBUG_AREA("index")
-
 Index::Index(const QString &storageRoot, const QString &name, Sink::Storage::DataStore::AccessMode mode)
     : mTransaction(Sink::Storage::DataStore(storageRoot, name, mode).createTransaction(mode)),
       mDb(mTransaction.openDatabase(name.toLatin1(), std::function<void(const Sink::Storage::DataStore::Error &)>(), true)),
-      mName(name)
+      mName(name),
+      mLogCtx("index." + name.toLatin1())
 {
 }
 
 Index::Index(const QByteArray &name, Sink::Storage::DataStore::Transaction &transaction)
-    : mDb(transaction.openDatabase(name, std::function<void(const Sink::Storage::DataStore::Error &)>(), true)), mName(name)
+    : mDb(transaction.openDatabase(name, std::function<void(const Sink::Storage::DataStore::Error &)>(), true)), mName(name),
+      mLogCtx("index." + name)
 {
 }
 
 void Index::add(const QByteArray &key, const QByteArray &value)
 {
     mDb.write(key, value, [&] (const Sink::Storage::DataStore::Error &error) {
-        SinkWarning() << "Error while writing value" << error;
+        SinkWarningCtx(mLogCtx) << "Error while writing value" << error;
     });
 }
 
 void Index::remove(const QByteArray &key, const QByteArray &value)
 {
     mDb.remove(key, value, [&] (const Sink::Storage::DataStore::Error &error) {
-        SinkWarning() << "Error while removing value: " << key << value << error << error.store;
+        SinkWarningCtx(mLogCtx) << "Error while removing value: " << key << value << error;
     });
 }
 
@@ -38,7 +38,7 @@ void Index::lookup(const QByteArray &key, const std::function<void(const QByteAr
             return true;
         },
         [&](const Sink::Storage::DataStore::Error &error) {
-            SinkWarning() << "Error while retrieving value" << error.message;
+            SinkWarningCtx(mLogCtx) << "Error while retrieving value:" << error << mName;
             errorHandler(Error(error.store, error.code, error.message));
         },
         matchSubStringKeys);
@@ -48,6 +48,6 @@ QByteArray Index::lookup(const QByteArray &key)
 {
     QByteArray result;
     //We have to create a deep copy, otherwise the returned data may become invalid when the transaction ends.
-    lookup(key, [&](const QByteArray &value) { result = QByteArray(value.constData(), value.size()); }, [this](const Index::Error &error) { SinkWarning() << "Error while retrieving value" << error.message; });
+    lookup(key, [&](const QByteArray &value) { result = QByteArray(value.constData(), value.size()); }, [this](const Index::Error &) { });
     return result;
 }
diff --git a/common/index.h b/common/index.h
index cfcc7a0..81dc5bf 100644
--- a/common/index.h
+++ b/common/index.h
@@ -44,5 +44,5 @@ private:
     Sink::Storage::DataStore::Transaction mTransaction;
     Sink::Storage::DataStore::NamedDatabase mDb;
     QString mName;
-    SINK_DEBUG_COMPONENT(mName.toLatin1())
+    Sink::Log::Context mLogCtx;
 };
-- 
cgit v1.2.3