From 1e96213e9617d658627f9219fa1750f4466de653 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 19 Jul 2016 13:23:32 +0200
Subject: Cleanup

---
 common/entityreader.cpp                |  1 -
 common/listener.cpp                    |  2 ++
 examples/imapresource/imapresource.cpp |  4 ++--
 synchronizer/main.cpp                  | 15 ++++-----------
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/common/entityreader.cpp b/common/entityreader.cpp
index 411e7e4..01c25d2 100644
--- a/common/entityreader.cpp
+++ b/common/entityreader.cpp
@@ -88,7 +88,6 @@ EntityReader<DomainType>::EntityReader(const QByteArray &resourceType, const QBy
     mDomainTypeAdaptorFactory(*mDomainTypeAdaptorFactoryPtr)
 {
     Q_ASSERT(!resourceType.isEmpty());
-    SinkTrace() << "resourceType " << resourceType;
     Q_ASSERT(mDomainTypeAdaptorFactoryPtr);
 }
 
diff --git a/common/listener.cpp b/common/listener.cpp
index 8f7518f..a051293 100644
--- a/common/listener.cpp
+++ b/common/listener.cpp
@@ -82,6 +82,7 @@ Listener::Listener(const QByteArray &resourceInstanceIdentifier, const QByteArra
 
 Listener::~Listener()
 {
+    SinkTrace() << "Shutting down " << m_resourceInstanceIdentifier;
     closeAllConnections();
 }
 
@@ -335,6 +336,7 @@ void Listener::sendShutdownNotification()
 
 void Listener::quit()
 {
+    SinkTrace() << "Quitting " << m_resourceInstanceIdentifier;
     m_clientBufferProcessesTimer->stop();
     m_server->close();
     sendShutdownNotification();
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 6f201ff..1dc503d 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -173,7 +173,7 @@ public:
             createOrModify(bufferType, remoteId, mail);
         }
         const auto elapsed = time->elapsed();
-        SinkLog() << "Synchronized " << count << " mails in " << path << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
+        SinkTrace() << "Synchronized " << count << " mails in " << path << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
     }
 
     void synchronizeRemovals(const QString &path, const QSet<qint64> &messages)
@@ -249,8 +249,8 @@ public:
                     continue;
                 }
                 QSet<qint64> uids;
+                SinkLog() << "Synchronizing mails" << folder.normalizedPath();
                 auto messagesFuture = imap.fetchMessages(folder, [this, folder, &uids](const QVector<Message> &messages) {
-                    SinkTrace() << "Synchronizing mails" << folder.normalizedPath();
                     for (const auto &msg : messages) {
                         uids << msg.uid;
                     }
diff --git a/synchronizer/main.cpp b/synchronizer/main.cpp
index e9dd6cb..110e59c 100644
--- a/synchronizer/main.cpp
+++ b/synchronizer/main.cpp
@@ -113,21 +113,14 @@ void terminateHandler()
     if (exptr != 0)
     {
         // the only useful feature of std::exception_ptr is that it can be rethrown...
-        try
-        {
+        try {
             std::rethrow_exception(exptr);
-        }
-        catch (std::exception &ex)
-        {
+        } catch (std::exception &ex) {
             std::fprintf(stderr, "Terminated due to exception: %s\n", ex.what());
-        }
-        catch (...)
-        {
+        } catch (...) {
             std::fprintf(stderr, "Terminated due to unknown exception\n");
         }
-    }
-    else
-    {
+    } else {
         std::fprintf(stderr, "Terminated due to unknown reason :(\n");
     }
     std::abort();
-- 
cgit v1.2.3