From 64a3e2d9ba3fe79dee53d86a4469f760eea8fcf9 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 2 Apr 2015 17:16:09 +0200
Subject: Cleanup and debug messages.

---
 common/pipeline.cpp               |  5 +++--
 dummyresource/domainadaptor.cpp   | 14 +++++++-------
 dummyresource/resourcefactory.cpp |  7 ++++---
 synchronizer/listener.cpp         |  2 +-
 tests/domainadaptortest.cpp       | 14 +++++++-------
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index f321cf5..ed40699 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -30,6 +30,7 @@
 #include "createentity_generated.h"
 #include "entitybuffer.h"
 #include "async/src/async.h"
+#include "log.h"
 
 namespace Akonadi2
 {
@@ -95,7 +96,7 @@ void Pipeline::null()
 
 Async::Job<void> Pipeline::newEntity(void const *command, size_t size)
 {
-    qDebug() << "Pipeline: New Entity";
+    Log() << "Pipeline: New Entity";
 
     //TODO toRFC4122 would probably be more efficient, but results in non-printable keys.
     const auto key = QUuid::createUuid().toString().toUtf8();
@@ -136,7 +137,7 @@ Async::Job<void> Pipeline::newEntity(void const *command, size_t size)
 
     storage().write(key.data(), key.size(), fbb.GetBufferPointer(), fbb.GetSize());
     storage().setMaxRevision(newRevision);
-    qDebug() << "Pipeline: wrote entity: "<< newRevision;
+    Log() << "Pipeline: wrote entity: "<< newRevision;
 
     return Async::start<void>([this, key, entityType](Async::Future<void> &future) {
         PipelineState state(this, NewPipeline, key, d->newPipeline[entityType], [&future]() {
diff --git a/dummyresource/domainadaptor.cpp b/dummyresource/domainadaptor.cpp
index d902052..2182f9a 100644
--- a/dummyresource/domainadaptor.cpp
+++ b/dummyresource/domainadaptor.cpp
@@ -100,13 +100,13 @@ QSharedPointer<Akonadi2::Domain::BufferAdaptor> DummyEventAdaptorFactory::create
         }
     }
 
-    Akonadi2::Metadata const *metadataBuffer = 0;
-    if (auto metadataData = entity.metadata()) {
-        flatbuffers::Verifier verifyer(metadataData->Data(), metadataData->size());
-        if (Akonadi2::VerifyMetadataBuffer(verifyer)) {
-            metadataBuffer = Akonadi2::GetMetadata(metadataData->Data());
-        }
-    }
+    // Akonadi2::Metadata const *metadataBuffer = 0;
+    // if (auto metadataData = entity.metadata()) {
+    //     flatbuffers::Verifier verifyer(metadataData->Data(), metadataData->size());
+    //     if (Akonadi2::VerifyMetadataBuffer(verifyer)) {
+    //         metadataBuffer = Akonadi2::GetMetadata(metadataData->Data());
+    //     }
+    // }
 
     Akonadi2::Domain::Buffer::Event const *localBuffer = 0;
     if (auto localData = entity.local()) {
diff --git a/dummyresource/resourcefactory.cpp b/dummyresource/resourcefactory.cpp
index 10c8eaf..9d702a8 100644
--- a/dummyresource/resourcefactory.cpp
+++ b/dummyresource/resourcefactory.cpp
@@ -170,7 +170,7 @@ private slots:
 
                         flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(ptr), size);
                         if (!Akonadi2::VerifyQueuedCommandBuffer(verifyer)) {
-                            qWarning() << "invalid buffer";
+                            Warning() << "invalid buffer";
                             callback(false);
                             return;
                         }
@@ -185,13 +185,13 @@ private slots:
                                 callback(true);
                             },
                             [callback](int errorCode, QString errorMessage) {
-                                Warning() << errorMessage;
+                                Warning() << "Error while processing queue command: " << errorMessage;
                                 callback(false);
                             }
                         ).exec();
                     },
                     [&future](const MessageQueue::Error &error) {
-                        Warning() << error.message;
+                        Warning() << "Error while getting message from messagequeue: " << error.message;
                         future.setValue(false);
                         future.setFinished();
                     }
@@ -209,6 +209,7 @@ private slots:
             [it, this](Async::Future<void> &future) {
                 auto queue = it->next();
                 processQueue(queue).then<void>([&future]() {
+                    Trace() << "Queue processed";
                     future.setFinished();
                 }).exec();
             }
diff --git a/synchronizer/listener.cpp b/synchronizer/listener.cpp
index 5165111..377c658 100644
--- a/synchronizer/listener.cpp
+++ b/synchronizer/listener.cpp
@@ -376,7 +376,7 @@ void Listener::loadResource()
         Log() << QString("\tFacades: %1").arg(Akonadi2::FacadeFactory::instance().getFacade<Akonadi2::Domain::Event>(m_resourceName)->type());
         m_resource->configurePipeline(m_pipeline);
     } else {
-        Warning() << QString("Failed to load resource %1").arg(m_resourceName);
+        Error() << QString("Failed to load resource %1").arg(m_resourceName);
     }
     //TODO: on failure ... what?
     //Enter broken state?
diff --git a/tests/domainadaptortest.cpp b/tests/domainadaptortest.cpp
index d1a9d26..cedbf94 100644
--- a/tests/domainadaptortest.cpp
+++ b/tests/domainadaptortest.cpp
@@ -74,13 +74,13 @@ public:
             }
         }
 
-        Akonadi2::Metadata const *metadataBuffer = 0;
-        if (auto metadataData = entity.metadata()) {
-            flatbuffers::Verifier verifyer(metadataData->Data(), metadataData->size());
-            if (Akonadi2::VerifyMetadataBuffer(verifyer)) {
-                metadataBuffer = Akonadi2::GetMetadata(metadataData);
-            }
-        }
+        // Akonadi2::Metadata const *metadataBuffer = 0;
+        // if (auto metadataData = entity.metadata()) {
+        //     flatbuffers::Verifier verifyer(metadataData->Data(), metadataData->size());
+        //     if (Akonadi2::VerifyMetadataBuffer(verifyer)) {
+        //         metadataBuffer = Akonadi2::GetMetadata(metadataData);
+        //     }
+        // }
 
         Akonadi2::Domain::Buffer::Event const *localBuffer = 0;
         if (auto localData = entity.local()) {
-- 
cgit v1.2.3