3 files changed, 26 insertions, 14 deletions

diff --git a/common/index.cpp b/common/index.cpp
index 25dfb7c..ae56da1 100644
--- a/common/index.cpp
+++ b/common/index.cpp
@@ -1,15 +1,21 @@
 #include "index.h"
-#include <QDebug>
+
+#include "log.h"
+
+#undef Trace
+#define Trace() Trace_area("index." + mName.toLatin1())
 
 Index::Index(const QString &storageRoot, const QString &name, Sink::Storage::AccessMode mode)
     : mTransaction(Sink::Storage(storageRoot, name, mode).createTransaction(mode)),
-    mDb(mTransaction.openDatabase(name.toLatin1(), std::function<void(const Sink::Storage::Error &)>(), true))
+    mDb(mTransaction.openDatabase(name.toLatin1(), std::function<void(const Sink::Storage::Error &)>(), true)),
+    mName(name)
 {
 
 }
 
 Index::Index(const QByteArray &name, Sink::Storage::Transaction &transaction)
-    : mDb(transaction.openDatabase(name, std::function<void(const Sink::Storage::Error &)>(), true))
+    : mDb(transaction.openDatabase(name, std::function<void(const Sink::Storage::Error &)>(), true)),
+    mName(name)
 {
 
 }
@@ -32,7 +38,7 @@ void Index::lookup(const QByteArray &key, const std::function<void(const QByteAr
         return true;
     },
     [errorHandler](const Sink::Storage::Error &error) {
-        qDebug() << "Error while retrieving value" << error.message;
+        Warning() << "Error while retrieving value" << error.message;
         errorHandler(Error(error.store, error.code, error.message));
     }
     );
@@ -45,8 +51,8 @@ QByteArray Index::lookup(const QByteArray &key)
     [&result](const QByteArray &value) {
         result = value;
     },
-    [](const Index::Error &error) {
-        qDebug() << "Error while retrieving value" << error.message;
+    [this](const Index::Error &error) {
+        Trace() << "Error while retrieving value" << error.message;
     });
     return result;
 }
diff --git a/common/index.h b/common/index.h
index 1a5b250..df79fc3 100644
--- a/common/index.h
+++ b/common/index.h
@@ -40,4 +40,5 @@ private:
     Q_DISABLE_COPY(Index);
     Sink::Storage::Transaction mTransaction;
     Sink::Storage::NamedDatabase mDb;
+    QString mName;
 };
diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index 1efffc4..f899767 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -32,9 +32,14 @@
 #include <QMutex>
 
 #include <lmdb.h>
+#include "log.h"
 
-namespace Sink
-{
+#undef Trace
+#define Trace() Trace_area("storage." + d->storageRoot.toLatin1() + '/' + d->name.toLatin1())
+#undef Warning
+#define Warning() Warning_area("storage")
+
+namespace Sink {
 
 int getErrorCode(int e)
 {
@@ -328,7 +333,7 @@ qint64 Storage::NamedDatabase::getSize()
     MDB_stat stat;
     rc = mdb_stat(d->transaction, d->dbi, &stat);
     if (rc) {
-        qWarning() << "Something went wrong " << rc;
+        Warning() << "Something went wrong " << rc;
     }
     // std::cout << "overflow_pages: " << stat.ms_overflow_pages << std::endl;
     // std::cout << "page size: " << stat.ms_psize << std::endl;
@@ -452,7 +457,7 @@ Storage::NamedDatabase Storage::Transaction::openDatabase(const QByteArray &db,
 QList<QByteArray> Storage::Transaction::getDatabaseNames() const
 {
     if (!d) {
-        qWarning() << "Invalid transaction";
+        Warning() << "Invalid transaction";
         return QList<QByteArray>();
     }
 
@@ -470,10 +475,10 @@ QList<QByteArray> Storage::Transaction::getDatabaseNames() const
                 list << QByteArray::fromRawData((char*)key.mv_data, key.mv_size);
             }
         } else {
-            qWarning() << "Failed to get a value" << rc;
+            Warning() << "Failed to get a value" << rc;
         }
     } else {
-        qWarning() << "Failed to open db" << rc << QByteArray(mdb_strerror(rc));
+        Warning() << "Failed to open db" << rc << QByteArray(mdb_strerror(rc));
     }
     return list;
 }
@@ -596,7 +601,7 @@ qint64 Storage::diskUsage() const
 {
     QFileInfo info(d->storageRoot + '/' + d->name + "/data.mdb");
     if (!info.exists()) {
-        qWarning() << "Tried to get filesize for non-existant file: " << info.path();
+        Warning() << "Tried to get filesize for non-existant file: " << info.path();
     }
     return info.size();
 }
@@ -606,7 +611,7 @@ void Storage::removeFromDisk() const
     const QString fullPath(d->storageRoot + '/' + d->name);
     QMutexLocker locker(&d->sMutex);
     QDir dir(fullPath);
-    std::cout << "Removing database from disk: " << fullPath.toStdString() << std::endl;
+    Trace() << "Removing database from disk: " << fullPath;
     if (!dir.removeRecursively()) {
         Error error(d->name.toLatin1(), ErrorCodes::GenericError, QString("Failed to remove directory %1 %2").arg(d->storageRoot).arg(d->name).toLatin1());
         defaultErrorHandler()(error);