Merge lp:~ken-vandine/content-hub/quiet_logging into lp:content-hub

[Ken VanDine]

Make debugging output optional based on CONTENT_HUB_LOGGING_LEVEL env variable.

Make debugging output optional based on CONTENT_HUB_LOGGING_LEVEL env variable.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/content-hub-ci/121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-i386-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/121/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Are there any related MPs required for this MP to build/function as expected?
 * No (besides the prerequisite branch included)
Is your branch in sync with latest trunk
 * Yes
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
 * Yes
Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?
 * Yes
If you changed the UI, was the change specified/approved by design?
 * No UI changes
If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 * No packaging changes

[lp:~ken-vandine/content-hub/quiet_logging]

139. By Ken VanDine on 2014-03-19

merged trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/content-hub-ci/126/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-i386-ci/29

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/126/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes, based on https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub (with updated gallery-app, address-book-app and ubuntu-system-settings branches for new API compatibility)

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

[lp:~ken-vandine/content-hub/quiet_logging]

140. By Ken VanDine on 2014-03-20

merged peer_picker_ui

141. By Ken VanDine on 2014-03-21

merged fix_pending_check

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-21 00:29:33 +0000
+++ CMakeLists.txt	2014-03-21 00:29:34 +0000
@@ -67,6 +67,8 @@
 pkg_check_modules(NIH_DBUS REQUIRED libnih-dbus)
 pkg_check_modules(DBUS REQUIRED dbus-1)
 
+add_definitions( -DDEBUG_ENABLED )
+
 set(CONTENT_HUB_VERSION_MAJOR 0)
 set(CONTENT_HUB_VERSION_MINOR 0)
 set(CONTENT_HUB_VERSION_PATCH 1)
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-03-07 06:59:44 +0000
+++ debian/changelog	2014-03-21 00:29:34 +0000
@@ -16,6 +16,16 @@
 
  -- Ubuntu daily release <[e-mail]>  Thu, 06 Mar 2014 16:50:24 +0000
 
+content-hub (0.0+14.04.20140304-0preview1) trusty; urgency=medium
+
+  * Support for more handler types, including sharing
+  * Marshal peer details like name and icon from the service, so confined apps
+    can show them.
+  * Improved QML bindings
+  * New ContentPeerPicker QML component
+
+ -- Ken VanDine <[e-mail]>  Mon, 27 Jan 2014 14:09:38 -0500
+
 content-hub (0.0+14.04.20131209.1-0ubuntu1) trusty; urgency=low
 
   [ Ken VanDine ]
 
=== modified file 'import/Ubuntu/Content/CMakeLists.txt'
--- import/Ubuntu/Content/CMakeLists.txt	2014-03-21 00:29:33 +0000
+++ import/Ubuntu/Content/CMakeLists.txt	2014-03-21 00:29:34 +0000
@@ -63,6 +63,7 @@
     contenttransfer.cpp
     contenttype.cpp
     qmlimportexporthandler.cpp
+    ../../../src/com/ubuntu/content/debug.cpp
     )
 
 add_library(${PLUGIN} MODULE ${PLUGIN_SRC} ${PLUGIN_HDRS})
 
=== modified file 'import/Ubuntu/Content/contenthandler.cpp'
--- import/Ubuntu/Content/contenthandler.cpp	2014-03-21 00:29:33 +0000
+++ import/Ubuntu/Content/contenthandler.cpp	2014-03-21 00:29:34 +0000
@@ -14,10 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../../../src/com/ubuntu/content/debug.h"
 #include "contenthandler.h"
 
-#include <QDebug>
-
 /*!
    \qmltype ContentHandler
    \instantiates ContentHandler
@@ -41,5 +40,5 @@
 ContentHandler::ContentHandler(QObject *parent)
     : QObject(parent)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 }
 
=== modified file 'import/Ubuntu/Content/contenthub.cpp'
--- import/Ubuntu/Content/contenthub.cpp	2014-03-21 00:29:33 +0000
+++ import/Ubuntu/Content/contenthub.cpp	2014-03-21 00:29:34 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../../../src/com/ubuntu/content/debug.h"
 #include "contenthub.h"
 #include "contentpeer.h"
 #include "contentstore.h"
@@ -26,7 +27,6 @@
 #include <com/ubuntu/content/type.h>
 
 #include <QStringList>
-#include <QDebug>
 
 /*!
  * \qmltype ContentHub
@@ -117,7 +117,7 @@
     : QObject(parent),
       m_hub(0)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     m_hub = cuc::Hub::Client::instance();
     m_handler = new QmlImportExportHandler(this);
     m_hub->register_import_export_handler(m_handler);
@@ -132,7 +132,7 @@
 
 ContentHub *ContentHub::instance()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     static ContentHub *contentHub = new ContentHub(nullptr);
     return contentHub;
 }
@@ -145,7 +145,7 @@
  */
 ContentTransfer* ContentHub::importContent(cuc::Peer peer)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 
     cuc::Transfer *hubTransfer = m_hub->create_import_from_peer(peer);
     ContentTransfer *qmlTransfer = new ContentTransfer(this);
@@ -162,7 +162,7 @@
  */
 ContentTransfer* ContentHub::exportContent(cuc::Peer peer)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 
     cuc::Transfer *hubTransfer = m_hub->create_export_to_peer(peer);
     ContentTransfer *qmlTransfer = new ContentTransfer(this);
@@ -179,7 +179,7 @@
  */
 ContentTransfer* ContentHub::shareContent(cuc::Peer peer)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 
     cuc::Transfer *hubTransfer = m_hub->create_share_to_peer(peer);
     ContentTransfer *qmlTransfer = new ContentTransfer(this);
@@ -194,7 +194,7 @@
  */
 void ContentHub::restoreImports()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 }
 
 /*!
@@ -203,7 +203,7 @@
  */
 QQmlListProperty<ContentTransfer> ContentHub::finishedImports()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return QQmlListProperty<ContentTransfer>(this, m_finishedImports);
 }
 
@@ -213,7 +213,7 @@
  */
 void ContentHub::handleImport(com::ubuntu::content::Transfer *transfer)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     ContentTransfer *qmlTransfer = nullptr;
     if (m_activeImports.contains(transfer)) {
         qmlTransfer = m_activeImports.take(transfer);
@@ -229,6 +229,12 @@
         Q_EMIT importRequested(qmlTransfer);
     }
 
+
+
+    // FIXME: maybe we need to emit something else here
+//    if (qmlTransfer->state() == ContentTransfer::Charged)
+//        Q_EMIT importRequested(qmlTransfer);
+
     m_finishedImports.append(qmlTransfer);
     Q_EMIT finishedImportsChanged();
 }
@@ -239,7 +245,7 @@
  */
 void ContentHub::handleExport(com::ubuntu::content::Transfer *transfer)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     ContentTransfer *qmlTransfer = nullptr;
     if (m_activeImports.contains(transfer))
         qmlTransfer = m_activeImports.take(transfer);
@@ -264,7 +270,7 @@
  */
 void ContentHub::handleShare(com::ubuntu::content::Transfer *transfer)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     ContentTransfer *qmlTransfer = nullptr;
     if (m_activeImports.contains(transfer))
     {
@@ -287,7 +293,7 @@
 
 void ContentHub::updateState()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 }
 
 /*!
 
=== modified file 'import/Ubuntu/Content/contenthubplugin.cpp'
--- import/Ubuntu/Content/contenthubplugin.cpp	2014-03-21 00:29:33 +0000
+++ import/Ubuntu/Content/contenthubplugin.cpp	2014-03-21 00:29:34 +0000
@@ -15,6 +15,7 @@
  */
 
 #include "contenthubplugin.h"
+#include "../../../src/com/ubuntu/content/debug.h"
 
 #include "contenthandler.h"
 #include "contenthub.h"
@@ -40,7 +41,7 @@
 {
     Q_UNUSED(engine)
     Q_UNUSED(scriptEngine)
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return ContentHub::instance();
 }
 
@@ -50,7 +51,7 @@
 void ContentHubPlugin::initializeEngine(QQmlEngine * engine, const char * uri)
 {
     Q_UNUSED(uri)
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     QIcon::setThemeName("ubuntu-mobile");
     QIcon::setThemeSearchPaths(QStringList() << ("/usr/share/icons/"));
     ContentIconProvider *iconProvider = ContentIconProvider::instance();
@@ -62,7 +63,7 @@
  */
 void ContentHubPlugin::registerTypes(const char *uri)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     Q_ASSERT(uri == QLatin1String("Ubuntu.Content"));
 
     const int versionMajor = 0;
 
=== modified file 'import/Ubuntu/Content/contenticonprovider.cpp'
--- import/Ubuntu/Content/contenticonprovider.cpp	2014-03-21 00:29:33 +0000
+++ import/Ubuntu/Content/contenticonprovider.cpp	2014-03-21 00:29:34 +0000
@@ -14,14 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../../../src/com/ubuntu/content/debug.h"
 #include "contenticonprovider.h"
 
-#include <QDebug>
-
 ContentIconProvider::ContentIconProvider()
     : QQuickImageProvider(QQuickImageProvider::Image)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 
     appIdImageMap = new QMap<QString, QImage>();
 }
@@ -39,7 +38,7 @@
  */
 void ContentIconProvider::addImage(QString appId, QImage image)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     appIdImageMap->insert(appId, image);
 }
 
@@ -51,7 +50,7 @@
 QImage ContentIconProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
 {
     Q_UNUSED(requestedSize)
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 
     QImage image = appIdImageMap->value(id);
     if(size) {
 
=== modified file 'import/Ubuntu/Content/contentitem.cpp'
--- import/Ubuntu/Content/contentitem.cpp	2013-11-07 20:12:56 +0000
+++ import/Ubuntu/Content/contentitem.cpp	2014-03-21 00:29:34 +0000
@@ -15,8 +15,7 @@
  */
 
 #include "contentitem.h"
-
-#include <QDebug>
+#include "../../../src/com/ubuntu/content/debug.h"
 
 /*!
  * \qmltype ContentItem
@@ -34,7 +33,7 @@
 ContentItem::ContentItem(QObject *parent)
     : QObject(parent)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 }
 
 /*!
@@ -43,13 +42,13 @@
  */
 const QString &ContentItem::name() const
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_name;
 }
 
 void ContentItem::setName(const QString &name)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     if (name == m_name)
         return;
 
@@ -64,13 +63,13 @@
  */
 const QUrl &ContentItem::url() const
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_item.url();
 }
 
 void ContentItem::setUrl(const QUrl &url)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     if (url == this->url())
         return;
 
@@ -84,7 +83,7 @@
  */
 const com::ubuntu::content::Item &ContentItem::item() const
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_item;
 }
 
@@ -94,7 +93,7 @@
  */
 void ContentItem::setItem(const com::ubuntu::content::Item &item)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     if (item == m_item)
         return;
 
 
=== modified file 'import/Ubuntu/Content/contentpeer.cpp'
--- import/Ubuntu/Content/contentpeer.cpp	2014-03-21 00:29:33 +0000
+++ import/Ubuntu/Content/contentpeer.cpp	2014-03-21 00:29:34 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../../../src/com/ubuntu/content/debug.h"
 #include "contenthandler.h"
 #include "contenthub.h"
 #include "contenticonprovider.h"
@@ -21,7 +22,6 @@
 #include "contenttype.h"
 
 #include <com/ubuntu/content/peer.h>
-#include <QDebug>
 #include <QIcon>
 
 /*!
@@ -46,7 +46,7 @@
       m_selectionType(ContentTransfer::Single),
       m_explicit_peer(false)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 
     m_hub = cuc::Hub::Client::instance();
 }
@@ -58,7 +58,7 @@
  */
 QString ContentPeer::name()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_peer.name();
 }
 
@@ -68,7 +68,7 @@
  */
 const QString &ContentPeer::appId() const
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_peer.id();
 }
 
@@ -79,13 +79,13 @@
  */
 void ContentPeer::setAppId(const QString& appId)
 {
-    qDebug() << Q_FUNC_INFO << appId;
+    TRACE() << Q_FUNC_INFO << appId;
     this->setPeer(cuc::Peer{appId});
 }
 
 QImage &ContentPeer::icon()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_icon;
 }
 
@@ -104,7 +104,7 @@
  */
 void ContentPeer::setPeer(const cuc::Peer &peer, bool explicitPeer)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     m_peer = peer;
     m_explicit_peer = explicitPeer;
     if (peer.iconData().isEmpty())
@@ -126,7 +126,7 @@
  */
 ContentHandler::Handler ContentPeer::handler()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_handler;
 }
 
@@ -136,7 +136,7 @@
  */
 void ContentPeer::setHandler(ContentHandler::Handler handler)
 {   
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     m_handler = handler;
 
     Q_EMIT handlerChanged();
@@ -148,7 +148,7 @@
  */
 ContentType::Type ContentPeer::contentType() 
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_contentType;
 }
 
@@ -158,7 +158,7 @@
  */
 void ContentPeer::setContentType(ContentType::Type contentType)
 {   
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     m_contentType = contentType;
 
     if(!m_explicit_peer) {
@@ -175,7 +175,7 @@
  */
 ContentTransfer::SelectionType ContentPeer::selectionType()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_selectionType;
 }
 
@@ -185,7 +185,7 @@
  */
 void ContentPeer::setSelectionType(ContentTransfer::SelectionType selectionType)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     m_selectionType = selectionType;
 
     Q_EMIT selectionTypeChanged();
@@ -197,7 +197,7 @@
  */
 bool ContentPeer::isDefaultPeer()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_peer.isDefaultPeer();
 }
 
@@ -208,7 +208,7 @@
  */
 ContentTransfer *ContentPeer::request()
 {   
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return request(nullptr);
 }
 
@@ -220,7 +220,7 @@
  */
 ContentTransfer *ContentPeer::request(ContentStore *store)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 
     ContentHub *contentHub = ContentHub::instance();
     ContentTransfer *qmlTransfer = NULL;
 
=== modified file 'import/Ubuntu/Content/contentpeermodel.cpp'
--- import/Ubuntu/Content/contentpeermodel.cpp	2014-03-21 00:29:33 +0000
+++ import/Ubuntu/Content/contentpeermodel.cpp	2014-03-21 00:29:34 +0000
@@ -14,11 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../../../src/com/ubuntu/content/debug.h"
 #include "contentpeermodel.h"
 #include <stdio.h>
 
-#include <QDebug>
-
 namespace cuc = com::ubuntu::content;
 
 /*!
@@ -39,7 +38,7 @@
       m_handler(ContentHandler::Source),
       m_complete(false)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     m_hub = cuc::Hub::Client::instance();
 }
 
@@ -69,7 +68,7 @@
  */
 ContentType::Type ContentPeerModel::contentType()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_contentType;
 }
 
@@ -79,7 +78,7 @@
  */
 void ContentPeerModel::setContentType(ContentType::Type contentType)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     m_contentType = contentType;
     if (m_complete) {
         findPeers();
@@ -92,7 +91,7 @@
  * \internal
  */
 void ContentPeerModel::findPeers() {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     m_peers.clear();
     QCoreApplication::processEvents();
     if(m_contentType == ContentType::All) {
@@ -113,7 +112,7 @@
  */
 void ContentPeerModel::appendPeersForContentType(ContentType::Type contentType)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     const cuc::Type &hubType = ContentType::contentType2HubType(contentType);
     QVector<cuc::Peer> hubPeers;
     if (m_handler == ContentHandler::Destination) {
@@ -151,7 +150,7 @@
  */
 ContentHandler::Handler ContentPeerModel::handler() 
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_handler;
 }
 
@@ -161,7 +160,7 @@
  */
 void ContentPeerModel::setHandler(ContentHandler::Handler handler)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     m_handler = handler;
     if (m_complete) {
         findPeers();
@@ -176,7 +175,7 @@
  */
 QQmlListProperty<ContentPeer> ContentPeerModel::peers()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return QQmlListProperty<ContentPeer>(this, m_peers);
 }
 
 
=== modified file 'import/Ubuntu/Content/contentscope.cpp'
--- import/Ubuntu/Content/contentscope.cpp	2014-03-21 00:29:33 +0000
+++ import/Ubuntu/Content/contentscope.cpp	2014-03-21 00:29:34 +0000
@@ -14,10 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../../../src/com/ubuntu/content/debug.h"
 #include "contentscope.h"
 
-#include <QDebug>
-
 /*!
    \qmltype ContentScope
    \instantiates ContentScope
@@ -41,7 +40,7 @@
 ContentScope::ContentScope(QObject *parent)
     : QObject(parent)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 }
 
 /*!
@@ -52,7 +51,7 @@
 com::ubuntu::content::Scope ContentScope::contentScope2HubScope(int scope)
 {
     Scope cscope = static_cast<Scope>(scope);
-    qDebug() << Q_FUNC_INFO << cscope;
+    TRACE() << Q_FUNC_INFO << cscope;
     return contentScope2HubScope(cscope);
 }
 
 
=== modified file 'import/Ubuntu/Content/contentstore.cpp'
--- import/Ubuntu/Content/contentstore.cpp	2014-03-21 00:29:33 +0000
+++ import/Ubuntu/Content/contentstore.cpp	2014-03-21 00:29:34 +0000
@@ -14,12 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../../../src/com/ubuntu/content/debug.h"
 #include "contentpeer.h"
 #include "contentstore.h"
 #include "contenttype.h"
 
-#include <QDebug>
-
 /*!
  * \qmltype ContentStore
  * \instantiates ContentStore
@@ -37,7 +36,7 @@
       m_store(0),
       m_scope(ContentScope::System)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     m_hub = cuc::Hub::Client::instance();
 }
 
@@ -50,7 +49,7 @@
 {
     static const QString __empty;
 
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 
     if ( ! m_store) {
         qWarning() << "Accessing ContentStore uri with NULL internal store";
@@ -65,7 +64,7 @@
  */
 const com::ubuntu::content::Store *ContentStore::store() const
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_store;
 }
 
@@ -75,7 +74,7 @@
  */
 void ContentStore::setStore(const com::ubuntu::content::Store *store)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     m_store = store;
     Q_EMIT uriChanged();
 }
@@ -87,7 +86,7 @@
  */
 ContentScope::Scope ContentStore::scope()
 {   
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_scope;
 }
 
@@ -97,7 +96,7 @@
  */
 void ContentStore::setScope(ContentScope::Scope scope)
 {   
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     m_scope = scope;
 
     Q_EMIT scopeChanged();
@@ -109,7 +108,7 @@
  */
 void ContentStore::updateStore(ContentType::Type contentType)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 
     com::ubuntu::content::Scope hubScope = ContentScope::contentScope2HubScope(m_scope);
     const com::ubuntu::content::Type &hubType = ContentType::contentType2HubType(contentType);
 
=== modified file 'import/Ubuntu/Content/contenttransfer.cpp'
--- import/Ubuntu/Content/contenttransfer.cpp	2014-03-21 00:29:33 +0000
+++ import/Ubuntu/Content/contenttransfer.cpp	2014-03-21 00:29:34 +0000
@@ -16,11 +16,10 @@
 
 #include "contenttransfer.h"
 #include "contentitem.h"
+#include "../../../src/com/ubuntu/content/debug.h"
 
 #include <com/ubuntu/content/item.h>
 
-#include <QDebug>
-
 /*!
  * \qmltype ContentTransfer
  * \instantiates ContentTransfer
@@ -39,7 +38,7 @@
       m_selectionType(Single),
       m_store(0)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 }
 
 /*!
@@ -76,18 +75,18 @@
  */
 ContentTransfer::State ContentTransfer::state() const
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_state;
 }
 
 void ContentTransfer::setState(ContentTransfer::State state)
 {
-    qDebug() << Q_FUNC_INFO << state;
+    TRACE() << Q_FUNC_INFO << state;
     if (!m_transfer)
         return;
 
     if (state == Charged && m_state == InProgress) {
-        qDebug() << Q_FUNC_INFO << "Charged";
+        TRACE() << Q_FUNC_INFO << "Charged";
         QVector<cuc::Item> hubItems;
         hubItems.reserve(m_items.size());
         Q_FOREACH (const ContentItem *citem, m_items) {
@@ -96,7 +95,7 @@
         m_transfer->charge(hubItems);
         return;
     } else if (state == Aborted) {
-        qDebug() << Q_FUNC_INFO << "Aborted";
+        TRACE() << Q_FUNC_INFO << "Aborted";
         m_transfer->abort();
     } else
         updateState();
@@ -153,7 +152,7 @@
 
 void ContentTransfer::setSelectionType(ContentTransfer::SelectionType type)
 {
-    qDebug() << Q_FUNC_INFO << type;
+    TRACE() << Q_FUNC_INFO << type;
     if (!m_transfer)
         return;
 
@@ -169,7 +168,7 @@
  */
 QQmlListProperty<ContentItem> ContentTransfer::items()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     if (m_state == Charged) {
         collectItems();
     }
@@ -183,7 +182,7 @@
  */
 bool ContentTransfer::start()
 {
-    qDebug() << Q_FUNC_INFO << m_transfer->id() << ":" << m_state;
+    TRACE() << Q_FUNC_INFO << m_transfer->id() << ":" << m_state;
     if (m_state == Created) {
         return m_transfer->start();
     } else {
@@ -199,7 +198,7 @@
  */
 bool ContentTransfer::finalize()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_transfer->finalize();
 }
 
@@ -209,13 +208,13 @@
  */
 const QString ContentTransfer::store() const
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_transfer->store().uri();
 }
 
 void ContentTransfer::setStore(ContentStore* contentStore)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 
     if (!m_transfer)
     {
@@ -234,7 +233,7 @@
  */
 com::ubuntu::content::Transfer *ContentTransfer::transfer() const
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return m_transfer;
 }
 
@@ -256,7 +255,7 @@
 
     m_transfer = transfer;
     m_direction = static_cast<ContentTransfer::Direction>(transfer->direction());
-    qDebug() << Q_FUNC_INFO << "Direction:" << m_direction;
+    TRACE() << Q_FUNC_INFO << "Direction:" << m_direction;
 
     connect(m_transfer, SIGNAL(selectionTypeChanged()), this, SLOT(updateSelectionType()));
     connect(m_transfer, SIGNAL(storeChanged()), this, SLOT(updateStore()));
@@ -273,7 +272,7 @@
  */
 void ContentTransfer::collectItems()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     if (m_state != Charged)
         return;
 
@@ -295,11 +294,11 @@
  */
 void ContentTransfer::updateState()
 {
-    qDebug() << Q_FUNC_INFO << m_transfer->state();
+    TRACE() << Q_FUNC_INFO << m_transfer->state();
 
     if (!m_transfer)
     {
-        qWarning() << Q_FUNC_INFO << "Invalid transfer";
+        TRACE() << Q_FUNC_INFO << "Invalid transfer";
         return;
     }
 
@@ -313,10 +312,10 @@
  */
 void ContentTransfer::updateSelectionType()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     if (!m_transfer)
     {
-        qWarning() << Q_FUNC_INFO << "Invalid transfer";
+        TRACE() << Q_FUNC_INFO << "Invalid transfer";
         return;
     }
 
@@ -331,10 +330,10 @@
  */
 void ContentTransfer::updateStore()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     if (!m_transfer)
     {
-        qWarning() << Q_FUNC_INFO << "Invalid transfer";
+        TRACE() << Q_FUNC_INFO << "Invalid transfer";
         return;
     }
 
 
=== modified file 'import/Ubuntu/Content/contenttype.cpp'
--- import/Ubuntu/Content/contenttype.cpp	2014-03-21 00:29:33 +0000
+++ import/Ubuntu/Content/contenttype.cpp	2014-03-21 00:29:34 +0000
@@ -15,8 +15,7 @@
  */
 
 #include "contenttype.h"
-
-#include <QDebug>
+#include "../../../src/com/ubuntu/content/debug.h"
 
 /*!
    \qmltype ContentType
@@ -57,7 +56,7 @@
 ContentType::ContentType(QObject *parent)
     : QObject(parent)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 }
 
 
@@ -69,7 +68,7 @@
 const com::ubuntu::content::Type &ContentType::contentType2HubType(int type)
 {
     Type ctype = static_cast<Type>(type);
-    qDebug() << Q_FUNC_INFO << ctype;
+    TRACE() << Q_FUNC_INFO << ctype;
     return contentType2HubType(ctype);
 }
 
 
=== modified file 'import/Ubuntu/Content/qmlimportexporthandler.cpp'
--- import/Ubuntu/Content/qmlimportexporthandler.cpp	2014-03-21 00:29:33 +0000
+++ import/Ubuntu/Content/qmlimportexporthandler.cpp	2014-03-21 00:29:34 +0000
@@ -15,11 +15,10 @@
  */
 
 #include "qmlimportexporthandler.h"
+#include "../../../src/com/ubuntu/content/debug.h"
 
 #include <com/ubuntu/content/transfer.h>
 
-#include <QDebug>
-
 namespace cuc = com::ubuntu::content;
 
 /*!
@@ -29,7 +28,7 @@
 QmlImportExportHandler::QmlImportExportHandler(QObject *parent)
     : cuc::ImportExportHandler(parent)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 }
 
 /*!
@@ -37,7 +36,7 @@
  */
 void QmlImportExportHandler::handle_import(com::ubuntu::content::Transfer *transfer)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     Q_EMIT importRequested(transfer);
 }
 
@@ -46,7 +45,7 @@
  */
 void QmlImportExportHandler::handle_export(com::ubuntu::content::Transfer *transfer)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     Q_EMIT exportRequested(transfer);
 }
 
@@ -55,6 +54,6 @@
  */
 void QmlImportExportHandler::handle_share(com::ubuntu::content::Transfer *transfer)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     Q_EMIT shareRequested(transfer);
 }
 
=== modified file 'src/com/ubuntu/content/CMakeLists.txt'
--- src/com/ubuntu/content/CMakeLists.txt	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/CMakeLists.txt	2014-03-21 00:29:34 +0000
@@ -68,6 +68,7 @@
   transfer.cpp
   type.cpp
   utils.cpp
+  debug.cpp
 
   detail/app_manager.cpp
   detail/service.cpp
 
=== added file 'src/com/ubuntu/content/debug.cpp'
--- src/com/ubuntu/content/debug.cpp	1970-01-01 00:00:00 +0000
+++ src/com/ubuntu/content/debug.cpp	2014-03-21 00:29:34 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "debug.h"
+
+int appLoggingLevel = 1; // criticals
+
+void setLoggingLevel(int level)
+{
+    appLoggingLevel = level;
+}
+
 
=== added file 'src/com/ubuntu/content/debug.h'
--- src/com/ubuntu/content/debug.h	1970-01-01 00:00:00 +0000
+++ src/com/ubuntu/content/debug.h	2014-03-21 00:29:34 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef DEBUG_H
+#define DEBUG_H
+
+#include <QDebug>
+
+/* 0 - fatal, 1 - critical(default), 2 - info/debug */
+extern int appLoggingLevel;
+
+static inline bool debugEnabled()
+{
+    return appLoggingLevel >= 2;
+}
+
+static inline bool criticalsEnabled()
+{
+    return appLoggingLevel >= 1;
+}
+
+static inline int loggingLevel()
+{
+    return appLoggingLevel;
+}
+
+void setLoggingLevel(int level);
+
+#ifdef DEBUG_ENABLED
+    #define TRACE() \
+        if (debugEnabled()) qDebug() << __FILE__ << __LINE__ << __func__
+    #define BLAME() \
+        if (criticalsEnabled()) qCritical() << __FILE__ << __LINE__ << __func__
+#else
+    #define TRACE() while (0) qDebug()
+    #define BLAME() while (0) qDebug()
+#endif
+
+#endif // DEBUG_H
+
 
=== modified file 'src/com/ubuntu/content/detail/app_manager.cpp'
--- src/com/ubuntu/content/detail/app_manager.cpp	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/detail/app_manager.cpp	2014-03-21 00:29:34 +0000
@@ -15,9 +15,9 @@
  */
 
 #include "app_manager.h"
+#include "debug.h"
 
 #include <upstart-app-launch.h>
-#include <QDebug>
 
 namespace cucd = com::ubuntu::content::detail;
 
@@ -27,7 +27,7 @@
 
 bool cucd::AppManager::invoke_application(const std::string &app_id)
 {
-    qDebug() << Q_FUNC_INFO << "APP_ID:" << app_id.c_str();
+    TRACE() << Q_FUNC_INFO << "APP_ID:" << app_id.c_str();
     gchar ** uris = NULL;
     gboolean ok = upstart_app_launch_start_application(app_id.c_str(), (const gchar * const *)uris);
     return static_cast<bool>(ok);
@@ -38,7 +38,7 @@
  */
 bool cucd::AppManager::stop_application(const std::string &app_id)
 {
-    qDebug() << Q_FUNC_INFO << "APP_ID:" << app_id.c_str();
+    TRACE() << Q_FUNC_INFO << "APP_ID:" << app_id.c_str();
 
     gboolean ok = upstart_app_launch_stop_application(app_id.c_str());
     return static_cast<bool>(ok);
 
=== modified file 'src/com/ubuntu/content/detail/handler.cpp'
--- src/com/ubuntu/content/detail/handler.cpp	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/detail/handler.cpp	2014-03-21 00:29:34 +0000
@@ -19,9 +19,9 @@
 #include "transfer_p.h"
 #include "handler.h"
 #include "utils.cpp"
+#include "debug.h"
 
 #include <QObject>
-#include <QDebug>
 
 namespace cucd = com::ubuntu::content::detail;
 namespace cuc = com::ubuntu::content;
@@ -35,7 +35,7 @@
               connection(connection),
               peer_id(peer_id)
     {
-        qDebug() << Q_FUNC_INFO;
+        TRACE() << Q_FUNC_INFO;
     }
 
     QDBusConnection connection;
@@ -45,7 +45,7 @@
 cucd::Handler::Handler(QDBusConnection connection, const QString& peer_id, cuc::ImportExportHandler* handler)
         : d(new Private{connection, peer_id, this})
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     m_handler = handler;
 }
 
@@ -55,20 +55,20 @@
 
 void cucd::Handler::HandleImport(const QDBusObjectPath& transfer)
 {
-    qDebug() << Q_FUNC_INFO << transfer.path();
+    TRACE() << Q_FUNC_INFO << transfer.path();
     cuc::Transfer* t = cuc::Transfer::Private::make_transfer(transfer, this);
 
-    qDebug() << Q_FUNC_INFO << "State:" << t->state();
+    TRACE() << Q_FUNC_INFO << "State:" << t->state();
     if (t->state() == cuc::Transfer::charged)
         m_handler->handle_import(t);
 }
 
 void cucd::Handler::HandleExport(const QDBusObjectPath& transfer)
 {
-    qDebug() << Q_FUNC_INFO << transfer.path();
+    TRACE() << Q_FUNC_INFO << transfer.path();
     cuc::Transfer* t = cuc::Transfer::Private::make_transfer(transfer, this);
 
-    qDebug() << Q_FUNC_INFO << "State:" << t->state();
+    TRACE() << Q_FUNC_INFO << "State:" << t->state();
     if (t->state() == cuc::Transfer::initiated)
     {
         t->d->handled();
@@ -78,10 +78,10 @@
 
 void cucd::Handler::HandleShare(const QDBusObjectPath& transfer)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     cuc::Transfer* t = cuc::Transfer::Private::make_transfer(transfer, this);
 
-    qDebug() << Q_FUNC_INFO << "State:" << t->state();
+    TRACE() << Q_FUNC_INFO << "State:" << t->state();
     if (t->state() == cuc::Transfer::charged)
     {
         m_handler->handle_share(t);
 
=== modified file 'src/com/ubuntu/content/detail/service.cpp'
--- src/com/ubuntu/content/detail/service.cpp	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/detail/service.cpp	2014-03-21 00:29:34 +0000
@@ -16,8 +16,8 @@
  * Authored by: Thomas Voß <[e-mail]>
  */
 
+#include "debug.h"
 #include "service.h"
-
 #include "peer_registry.h"
 #include "transfer.h"
 #include "transferadaptor.h"
@@ -94,10 +94,10 @@
 
 cucd::Service::~Service()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     Q_FOREACH (cucd::Transfer *t, d->active_transfers)
     {
-        qDebug() << Q_FUNC_INFO << "Destroying transfer:" << t->Id();
+        TRACE() << Q_FUNC_INFO << "Destroying transfer:" << t->Id();
         delete t;
     }
 }
@@ -158,11 +158,11 @@
 
 QDBusObjectPath cucd::Service::CreateImportFromPeer(const QString& peer_id, const QString& app_id)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     QString dest_id = app_id;
     if (dest_id.isEmpty())
     {
-        qDebug() << Q_FUNC_INFO << "APP_ID isnt' set, attempting to get it from AppArmor";
+        TRACE() << Q_FUNC_INFO << "APP_ID isnt' set, attempting to get it from AppArmor";
         dest_id = aa_profile(this->message().service());
     }
     return CreateTransfer(dest_id, peer_id, cuc::Transfer::Import);
@@ -170,7 +170,7 @@
 
 bool cucd::Service::should_cancel (int st)
 {
-    qDebug() << Q_FUNC_INFO << "State:" << st;
+    TRACE() << Q_FUNC_INFO << "State:" << st;
 
     return (st != cuc::Transfer::finalized
             && st != cuc::Transfer::collected
@@ -179,11 +179,11 @@
 
 QDBusObjectPath cucd::Service::CreateExportToPeer(const QString& peer_id, const QString& app_id)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     QString src_id = app_id;
     if (src_id.isEmpty())
     {
-        qDebug() << Q_FUNC_INFO << "APP_ID isnt' set, attempting to get it from AppArmor";
+        TRACE() << Q_FUNC_INFO << "APP_ID isnt' set, attempting to get it from AppArmor";
         src_id = aa_profile(this->message().service());
     }
     return CreateTransfer(peer_id, src_id, cuc::Transfer::Export);
@@ -191,11 +191,11 @@
 
 QDBusObjectPath cucd::Service::CreateShareToPeer(const QString& peer_id, const QString& app_id)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     QString src_id = app_id;
     if (src_id.isEmpty())
     {
-        qDebug() << Q_FUNC_INFO << "APP_ID isnt' set, attempting to get it from AppArmor";
+        TRACE() << Q_FUNC_INFO << "APP_ID isnt' set, attempting to get it from AppArmor";
         src_id = aa_profile(this->message().service());
     }
     return CreateTransfer(peer_id, src_id, cuc::Transfer::Share);
@@ -203,7 +203,7 @@
 
 QDBusObjectPath cucd::Service::CreateTransfer(const QString& dest_id, const QString& src_id, int dir)
 {
-    qDebug() << Q_FUNC_INFO << "DEST:" << dest_id << "SRC:" << src_id << "DIRECTION:" << dir;
+    TRACE() << Q_FUNC_INFO << "DEST:" << dest_id << "SRC:" << src_id << "DIRECTION:" << dir;
 
     static size_t import_counter{0}; import_counter++;
 
@@ -213,10 +213,10 @@
     {
         if (t->destination() == dest_id || t->source() == src_id)
         {
-            qDebug() << Q_FUNC_INFO << "Found transfer for peer_id:" << src_id;
+            TRACE() << Q_FUNC_INFO << "Found transfer for peer_id:" << src_id;
             if (should_cancel(t->State()))
             {
-                qDebug() << Q_FUNC_INFO << "Aborting active transfer:" << t->Id();
+                TRACE() << Q_FUNC_INFO << "Aborting active transfer:" << t->Id();
                 t->Abort();
             }
         }
@@ -229,10 +229,10 @@
     auto destination = transfer->import_path();
     auto source = transfer->export_path();
     if (not d->connection.registerObject(source, transfer))
-        qDebug() << "Problem registering object for path: " << source;
+        TRACE() << "Problem registering object for path: " << source;
     d->connection.registerObject(destination, transfer);
 
-    qDebug() << "Created transfer " << source << " -> " << destination;
+    TRACE() << "Created transfer " << source << " -> " << destination;
 
     // Content flow is different for import
     if (dir == cuc::Transfer::Import)
@@ -247,13 +247,13 @@
 
 void cucd::Service::handle_imports(int state)
 {
-    qDebug() << Q_FUNC_INFO << state;
+    TRACE() << Q_FUNC_INFO << state;
     cucd::Transfer *transfer = static_cast<cucd::Transfer*>(sender());
-    qDebug() << Q_FUNC_INFO << "State: " << transfer->State() << "Id:" << transfer->Id();
+    TRACE() << Q_FUNC_INFO << "State: " << transfer->State() << "Id:" << transfer->Id();
 
     if (state == cuc::Transfer::initiated)
     {
-        qDebug() << Q_FUNC_INFO << "initiated";
+        TRACE() << Q_FUNC_INFO << "initiated";
         if (d->app_manager->is_application_started(transfer->source().toStdString()))
             transfer->SetSourceStartedByContentHub(false);
         else
@@ -261,14 +261,14 @@
 
         Q_FOREACH (RegHandler *r, d->handlers)
         {
-            qDebug() << Q_FUNC_INFO << "ID:" << r->id << "Handler: " << r->service << "Transfer: " << transfer->source();
+            TRACE() << Q_FUNC_INFO << "ID:" << r->id << "Handler: " << r->service << "Transfer: " << transfer->source();
             if (r->id == transfer->source())
             {
-                qDebug() << Q_FUNC_INFO << "Found handler for initiated transfer" << r->id;
+                TRACE() << Q_FUNC_INFO << "Found handler for initiated transfer" << r->id;
                 if (r->handler->isValid())
                     r->handler->HandleExport(QDBusObjectPath{transfer->export_path()});
                 else
-                    qDebug() << Q_FUNC_INFO << "Handler invalid";
+                    TRACE() << Q_FUNC_INFO << "Handler invalid";
             }
         }
 
@@ -277,7 +277,7 @@
 
     if (state == cuc::Transfer::charged)
     {
-        qDebug() << Q_FUNC_INFO << "Charged";
+        TRACE() << Q_FUNC_INFO << "Charged";
         if (transfer->WasSourceStartedByContentHub())
             d->app_manager->stop_application(transfer->source().toStdString());
         
@@ -285,10 +285,10 @@
 
         Q_FOREACH (RegHandler *r, d->handlers)
         {
-            qDebug() << Q_FUNC_INFO << "ID:" << r->id << "Handler: " << r->service << "Transfer: " << transfer->destination();
+            TRACE() << Q_FUNC_INFO << "ID:" << r->id << "Handler: " << r->service << "Transfer: " << transfer->destination();
             if (r->id == transfer->destination())
             {
-                qDebug() << Q_FUNC_INFO << "Found handler for charged transfer" << r->id;
+                TRACE() << Q_FUNC_INFO << "Found handler for charged transfer" << r->id;
                 if (r->handler->isValid())
                     r->handler->HandleImport(QDBusObjectPath{transfer->import_path()});
             }
@@ -304,39 +304,43 @@
             {
                 if (t->Id() != transfer->Id())
                 {
-                    if ((t->source() == transfer->source()) || (t->destination() == transfer->destination()))
+                    if ((t->source() == transfer->source()) && (t->State() == cuc::Transfer::in_progress))
                     {
-                        qDebug() << Q_FUNC_INFO << "Peer has pending transfers:" << t->Id();
+                        TRACE() << Q_FUNC_INFO << "Source has pending transfers:" << t->Id();
                         shouldStop = false;
                     }
+                    if (t->destination() == transfer->destination())
+                    {
+                        qDebug() << Q_FUNC_INFO << "Destination has pending transfers:" << t->Id();
+                        if (should_cancel(t->State()))
+                            shouldStop = false;
+                    }
                 }
             }
             if (shouldStop)
-            {
-                d->app_manager->stop_application(transfer->source().toStdString());
-                d->app_manager->invoke_application(transfer->destination().toStdString());
-            }
+                d->app_manager->stop_application(transfer->source().toStdString());            
         }
+        d->app_manager->invoke_application(transfer->destination().toStdString());
     }
 }
 
 void cucd::Service::handle_exports(int state)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     cucd::Transfer *transfer = static_cast<cucd::Transfer*>(sender());
 
-    qDebug() << Q_FUNC_INFO << "STATE:" << transfer->State();
+    TRACE() << Q_FUNC_INFO << "STATE:" << transfer->State();
 
 
     if (state == cuc::Transfer::initiated)
     {
-        qDebug() << Q_FUNC_INFO << "Initiated";
+        TRACE() << Q_FUNC_INFO << "Initiated";
         transfer->Handled();
     }
 
     if (state == cuc::Transfer::charged)
     {
-        qDebug() << Q_FUNC_INFO << "Charged";
+        TRACE() << Q_FUNC_INFO << "Charged";
         if (d->app_manager->is_application_started(transfer->destination().toStdString()))
             transfer->SetSourceStartedByContentHub(false);
         else
@@ -346,10 +350,10 @@
 
         Q_FOREACH (RegHandler *r, d->handlers)
         {
-            qDebug() << "Handler: " << r->service << "Transfer: " << transfer->destination();
+            TRACE() << "Handler: " << r->service << "Transfer: " << transfer->destination();
             if (r->id == transfer->destination())
             {
-                qDebug() << "Found handler for charged transfer" << r->id;
+                TRACE() << "Found handler for charged transfer" << r->id;
                 if (transfer->Direction() == cuc::Transfer::Share && r->handler->isValid())
                     r->handler->HandleShare(QDBusObjectPath{transfer->import_path()});
                 else if (r->handler->isValid())
@@ -360,7 +364,7 @@
 
     if (state == cuc::Transfer::finalized)
     {
-        qDebug() << Q_FUNC_INFO << "Finalized";
+        TRACE() << Q_FUNC_INFO << "Finalized";
         if (transfer->WasSourceStartedByContentHub())
             d->app_manager->stop_application(transfer->destination().toStdString());
 
@@ -369,7 +373,7 @@
 
     if (state == cuc::Transfer::aborted)
     {
-        qDebug() << Q_FUNC_INFO << "Aborted";
+        TRACE() << Q_FUNC_INFO << "Aborted";
         if (transfer->WasSourceStartedByContentHub())
         {
             bool shouldStop = true;
@@ -377,35 +381,39 @@
             {
                 if (t->Id() != transfer->Id())
                 {
-                    if ((t->source() == transfer->source()) || (t->destination() == transfer->destination()))
+                    if ((t->source() == transfer->source()) && (t->State() == cuc::Transfer::in_progress))
                     {
-                        qDebug() << Q_FUNC_INFO << "Peer has pending transfers:" << t->Id();
+                        TRACE() << Q_FUNC_INFO << "Source has pending transfers:" << t->Id();
                         shouldStop = false;
                     }
+                    if (t->destination() == transfer->destination())
+                    {
+                        qDebug() << Q_FUNC_INFO << "Destination has pending transfers:" << t->Id();
+                        if (should_cancel(t->State()))
+                            shouldStop = false;
+                    }
                 }
             }
             if (shouldStop)
-            {
                 d->app_manager->stop_application(transfer->destination().toStdString());
-                d->app_manager->invoke_application(transfer->source().toStdString());
-            }
         }
+        d->app_manager->invoke_application(transfer->source().toStdString());
     }
 }
 
 void cucd::Service::handler_unregistered(const QString& s)
 {
-    qDebug() << Q_FUNC_INFO << s;
+    TRACE() << Q_FUNC_INFO << s;
 
     if (d->handlers.isEmpty())
         return;
 
     Q_FOREACH (RegHandler *r, d->handlers)
     {
-        qDebug() << "Handler: " << r->id;
+        TRACE() << "Handler: " << r->id;
         if (r->service == s)
         {
-            qDebug() << "Found match for " << r->id;
+            TRACE() << "Found match for " << r->id;
             d->handlers.remove(r);
             m_watcher->removeWatchedService(s);
             delete r;
@@ -415,15 +423,15 @@
 
 void cucd::Service::RegisterImportExportHandler(const QString& peer_id, const QDBusObjectPath& handler)
 {
-    qDebug() << Q_FUNC_INFO << peer_id;
+    TRACE() << Q_FUNC_INFO << peer_id;
     bool exists = false;
     RegHandler* r;
     Q_FOREACH (RegHandler *rh, d->handlers)
     {
-        qDebug() << "Handler: " << rh->id;
+        TRACE() << "Handler: " << rh->id;
         if (rh->id == peer_id)
         {
-            qDebug() << "Found existing handler for " << rh->id;
+            TRACE() << "Found existing handler for " << rh->id;
             exists = true;
             r = rh;
         }
@@ -442,14 +450,14 @@
         m_watcher->addWatchedService(r->service);
     }
 
-    qDebug() << Q_FUNC_INFO << r->id;
+    TRACE() << Q_FUNC_INFO << r->id;
 
     Q_FOREACH (cucd::Transfer *t, d->active_transfers)
     {
-        qDebug() << Q_FUNC_INFO << "SOURCE: " << t->source() << "DEST:" << t->destination() << "STATE:" << t->State();
+        TRACE() << Q_FUNC_INFO << "SOURCE: " << t->source() << "DEST:" << t->destination() << "STATE:" << t->State();
         if ((t->source() == peer_id) && (t->State() == cuc::Transfer::initiated))
         {
-            qDebug() << Q_FUNC_INFO << "Found source:" << peer_id << "Direction:" << t->Direction();
+            TRACE() << Q_FUNC_INFO << "Found source:" << peer_id << "Direction:" << t->Direction();
             if (t->Direction() == cuc::Transfer::Import)
             {
                 if (r->handler->isValid())
@@ -458,15 +466,15 @@
         }
         else if ((t->destination() == peer_id) && (t->State() == cuc::Transfer::charged))
         {
-            qDebug() << Q_FUNC_INFO << "Found destination:" << peer_id << "Direction:" << t->Direction();
+            TRACE() << Q_FUNC_INFO << "Found destination:" << peer_id << "Direction:" << t->Direction();
             if (t->Direction() == cuc::Transfer::Export)
             {
-                qDebug() << Q_FUNC_INFO << "Found import, calling HandleImport";
+                TRACE() << Q_FUNC_INFO << "Found import, calling HandleImport";
                 if (r->handler->isValid())
                     r->handler->HandleImport(QDBusObjectPath{t->import_path()});
             } else if (t->Direction() == cuc::Transfer::Share)
             {
-                qDebug() << Q_FUNC_INFO << "Found share, calling HandleShare";
+                TRACE() << Q_FUNC_INFO << "Found share, calling HandleShare";
                 if (r->handler->isValid())
                     r->handler->HandleShare(QDBusObjectPath{t->import_path()});
             }
 
=== modified file 'src/com/ubuntu/content/detail/transfer.cpp'
--- src/com/ubuntu/content/detail/transfer.cpp	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/detail/transfer.cpp	2014-03-21 00:29:34 +0000
@@ -16,6 +16,7 @@
  * Authored by: Thomas Voß <[e-mail]>
  */
 
+#include "debug.h"
 #include "transfer.h"
 #include "utils.cpp"
 
@@ -23,8 +24,6 @@
 #include <com/ubuntu/content/store.h>
 #include <com/ubuntu/content/transfer.h>
 
-#include <QDebug>
-
 namespace cuc = com::ubuntu::content;
 namespace cucd = com::ubuntu::content::detail;
 
@@ -62,51 +61,51 @@
                          QObject* parent) :
     QObject(parent), d(new Private(id, source, destination, direction))
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
 }
 
 cucd::Transfer::~Transfer()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
     purge_store_cache(d->store);
 }
 
 /* unique id of the transfer */
 int cucd::Transfer::Id()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
     return d->id;
 }
 
 /* returns the peer_id of the requested export handler */
 QString cucd::Transfer::source()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
     return d->source;
 }
 
 /* returns the peer_id of the application requesting the import */
 QString cucd::Transfer::destination()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
     return d->destination;
 }
 
 int cucd::Transfer::Direction()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
     return d->direction;
 }
 
 int cucd::Transfer::State()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
     return d->state;
 }
 
 void cucd::Transfer::Abort()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
 
     if (d->state == cuc::Transfer::aborted)
         return;
@@ -119,7 +118,7 @@
 
 void cucd::Transfer::Start()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
 
     if (d->state == cuc::Transfer::initiated)
         return;
@@ -130,7 +129,7 @@
 
 void cucd::Transfer::Handled()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
 
     if (d->state == cuc::Transfer::in_progress)
         return;
@@ -141,7 +140,7 @@
 
 void cucd::Transfer::Charge(const QStringList& items)
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
 
     if (d->state == cuc::Transfer::charged)
         return;
@@ -151,7 +150,7 @@
         ret.append(copy_to_store(i, d->store));
 
     Q_FOREACH(QString f, ret)
-        qDebug() << Q_FUNC_INFO << "Item:" << f;
+        TRACE() << Q_FUNC_INFO << "Item:" << f;
 
     if (ret.count() <= 0)
     {
@@ -168,7 +167,7 @@
 
 QStringList cucd::Transfer::Collect()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
 
     if (d->state != cuc::Transfer::collected)
     {
@@ -181,7 +180,7 @@
 
 void cucd::Transfer::Finalize()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
 
     if (d->state == cuc::Transfer::finalized)
         return;
@@ -194,13 +193,13 @@
 
 QString cucd::Transfer::Store()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
     return d->store;
 }
 
 void cucd::Transfer::SetStore(QString uri)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 
     if (d->store == uri)
         return;
@@ -211,13 +210,13 @@
 
 int cucd::Transfer::SelectionType()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    TRACE() << __PRETTY_FUNCTION__;
     return d->selection_type;
 }
 
 void cucd::Transfer::SetSelectionType(int type)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     if (d->state != cuc::Transfer::created)
         return;
     if (d->selection_type == type)
@@ -230,7 +229,7 @@
 /* returns the object path for the export */
 QString cucd::Transfer::export_path()
 {
-    qDebug() << Q_FUNC_INFO << "source:" << d->source;
+    TRACE() << Q_FUNC_INFO << "source:" << d->source;
     static const QString exporter_path_pattern{"/transfers/%1/export/%2"};
     QString source = exporter_path_pattern
             .arg(sanitize_id(d->source))
@@ -241,7 +240,7 @@
 /* returns the object path for the import */
 QString cucd::Transfer::import_path()
 {
-    qDebug() << Q_FUNC_INFO << "destination:" << d->destination;
+    TRACE() << Q_FUNC_INFO << "destination:" << d->destination;
     static const QString importer_path_pattern{"/transfers/%1/import/%2"};
     QString destination = importer_path_pattern
             .arg(sanitize_id(d->destination))
 
=== modified file 'src/com/ubuntu/content/hub.cpp'
--- src/com/ubuntu/content/hub.cpp	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/hub.cpp	2014-03-21 00:29:34 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "common.h"
+#include "debug.h"
 #include "ContentServiceInterface.h"
 #include "ContentHandlerInterface.h"
 #include "handleradaptor.h"
@@ -31,6 +32,7 @@
 #include <com/ubuntu/content/type.h>
 
 #include <QStandardPaths>
+#include <QProcessEnvironment>
 #include <map>
 
 namespace cuc = com::ubuntu::content;
@@ -51,6 +53,15 @@
 
 cuc::Hub::Hub(QObject* parent) : QObject(parent), d{new cuc::Hub::Private{this}}
 {
+    /* read environment variables */
+    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
+    if (environment.contains(QLatin1String("CONTENT_HUB_LOGGING_LEVEL"))) {
+        bool isOk;
+        int value = environment.value(
+            QLatin1String("CONTENT_HUB_LOGGING_LEVEL")).toInt(&isOk);
+        if (isOk)
+            setLoggingLevel(value);
+    }
 }
 
 cuc::Hub::~Hub()
@@ -65,7 +76,7 @@
 
 void cuc::Hub::register_import_export_handler(cuc::ImportExportHandler* handler)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     QString id = app_id();
 
     if (id.isEmpty())
@@ -116,7 +127,7 @@
 
 cuc::Peer cuc::Hub::default_source_for_type(cuc::Type t)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     auto reply = d->service->DefaultSourceForType(t.id());
     reply.waitForFinished();
 
@@ -215,9 +226,9 @@
     cuc::Transfer *transfer = cuc::Transfer::Private::make_transfer(reply.value(), this);
 
     QString peerName = peer.id().split("_")[0];
-    qDebug() << Q_FUNC_INFO << "peerName: " << peerName;
+    TRACE() << Q_FUNC_INFO << "peerName: " << peerName;
     const cuc::Store *store = new cuc::Store{QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/" + peerName + "/HubIncoming/" + QString::number(transfer->id()), this};
-    qDebug() << Q_FUNC_INFO << "STORE:" << store->uri();
+    TRACE() << Q_FUNC_INFO << "STORE:" << store->uri();
     transfer->setStore(store);
     transfer->start();
     return transfer;
@@ -236,9 +247,9 @@
 
     cuc::Transfer *transfer = cuc::Transfer::Private::make_transfer(reply.value(), this);
     QString peerName = peer.id().split("_")[0];
-    qDebug() << Q_FUNC_INFO << "peerName: " << peerName;
+    TRACE() << Q_FUNC_INFO << "peerName: " << peerName;
     const cuc::Store *store = new cuc::Store{QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/" + peerName + "/HubIncoming/" + QString::number(transfer->id()), this};
-    qDebug() << Q_FUNC_INFO << "STORE:" << store->uri();
+    TRACE() << Q_FUNC_INFO << "STORE:" << store->uri();
     transfer->setStore(store);
     transfer->start();
     return transfer;
 
=== modified file 'src/com/ubuntu/content/peer.cpp'
--- src/com/ubuntu/content/peer.cpp	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/peer.cpp	2014-03-21 00:29:34 +0000
@@ -16,10 +16,10 @@
  * Authored by: Thomas Voß <[e-mail]>
  */
 
-
 #include <gio/gdesktopappinfo.h>
 #include <com/ubuntu/content/peer.h>
 #include <QMetaType>
+#include "debug.h"
 
 namespace cuc = com::ubuntu::content;
 
@@ -27,7 +27,7 @@
 {
     Private (QString id, bool isDefaultPeer) : id(id), isDefaultPeer(isDefaultPeer)
     {
-        qDebug() << Q_FUNC_INFO << id;
+        TRACE() << Q_FUNC_INFO << id;
         if (name.isEmpty())
         {
             QString desktop_id(id + ".desktop");
@@ -69,7 +69,7 @@
 
 cuc::Peer::Peer(const QString& id, bool isDefaultPeer, QObject* parent) : QObject(parent), d(new cuc::Peer::Private{id, isDefaultPeer})
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 }
 
 cuc::Peer::Peer(const cuc::Peer& rhs) : QObject(rhs.parent()), d(rhs.d)
@@ -147,7 +147,7 @@
 
 const QDBusArgument &operator>>(const QDBusArgument &argument, cuc::Peer &peer)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     QString id;
     QString name;
     QByteArray ic;
 
=== modified file 'src/com/ubuntu/content/service/CMakeLists.txt'
--- src/com/ubuntu/content/service/CMakeLists.txt	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/service/CMakeLists.txt	2014-03-21 00:29:34 +0000
@@ -32,6 +32,7 @@
 
   main.cpp
   registry.cpp
+  ../debug.cpp
   ${CONTENT_SERVICE_SKELETON}
 )
 
 
=== modified file 'src/com/ubuntu/content/service/helper.cpp'
--- src/com/ubuntu/content/service/helper.cpp	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/service/helper.cpp	2014-03-21 00:29:34 +0000
@@ -19,6 +19,7 @@
 #include <QCoreApplication>
 
 #include "hook.h"
+#include "debug.h"
 
 namespace cuc = com::ubuntu::content;
 
@@ -26,7 +27,7 @@
 {
     QCoreApplication app(argc, argv);
 
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 
     if (app.arguments().count() > 1)
     {
@@ -34,6 +35,16 @@
             return 1;
     }
 
+    /* read environment variables */
+    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
+    if (environment.contains(QLatin1String("CONTENT_HUB_LOGGING_LEVEL"))) {
+        bool isOk;
+        int value = environment.value(
+            QLatin1String("CONTENT_HUB_LOGGING_LEVEL")).toInt(&isOk);
+        if (isOk)
+            setLoggingLevel(value);
+    }
+
     new cuc::detail::Hook();
 
     app.exec();
 
=== modified file 'src/com/ubuntu/content/service/hook.cpp'
--- src/com/ubuntu/content/service/hook.cpp	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/service/hook.cpp	2014-03-21 00:29:34 +0000
@@ -22,10 +22,10 @@
 #include <QFile>
 #include <QDir>
 #include <QStandardPaths>
-#include <QDebug>
 #include <QTimer>
 #include <com/ubuntu/content/peer.h>
 
+#include "debug.h"
 #include "hook.h"
 
 namespace cucd = com::ubuntu::content::detail;
@@ -45,7 +45,7 @@
 
 void cucd::Hook::run()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     /* Looks for files in ${HOME}/.local/share/content-hub/${id} installed
      * by click packages.  These files are JSON, for example:
      *
@@ -76,7 +76,7 @@
 
     Q_FOREACH(QString p, all_peers)
     {
-        qDebug() << Q_FUNC_INFO << "Looking for" << p;
+        TRACE() << Q_FUNC_INFO << "Looking for" << p;
         QStringList pp = contentDir.entryList(QStringList("*"+ p));
         if (pp.isEmpty())
             registry->remove_peer(com::ubuntu::content::Peer{p});
@@ -90,7 +90,7 @@
 
 bool cucd::Hook::add_peer(QFileInfo result)
 {
-    qDebug() << Q_FUNC_INFO << "Hook:" << result.filePath();
+    TRACE() << Q_FUNC_INFO << "Hook:" << result.filePath();
 
     QStringList knownTypes;
     knownTypes << "pictures" << "music" << "contacts" << "documents";
@@ -117,7 +117,7 @@
         if (knownTypes.contains(k))
         {
             if (registry->install_source_for_type(cuc::Type{k}, peer))
-                qDebug() << "Installed source:" << peer.id() << "for type:" << k;
+                TRACE() << "Installed source:" << peer.id() << "for type:" << k;
         }
         else
             qWarning() << "Failed to install" << peer.id() << "unknown type:" << k;
@@ -129,7 +129,7 @@
         if (knownTypes.contains(k))
         {
             if (registry->install_destination_for_type(cuc::Type{k}, peer))
-                qDebug() << "Installed destination:" << peer.id() << "for type:" << k;
+                TRACE() << "Installed destination:" << peer.id() << "for type:" << k;
         }
         else
             qWarning() << "Failed to install" << peer.id() << "unknown type:" << k;
@@ -141,7 +141,7 @@
         if (knownTypes.contains(k))
         {
             if (registry->install_share_for_type(cuc::Type{k}, peer))
-                qDebug() << "Installed share:" << peer.id() << "for type:" << k;
+                TRACE() << "Installed share:" << peer.id() << "for type:" << k;
         }
         else
             qWarning() << "Failed to install" << peer.id() << "unknown type:" << k;
 
=== modified file 'src/com/ubuntu/content/service/main.cpp'
--- src/com/ubuntu/content/service/main.cpp	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/service/main.cpp	2014-03-21 00:29:34 +0000
@@ -17,10 +17,11 @@
  */
 
 #include <QCoreApplication>
-#include <QDebug>
+#include <QProcessEnvironment>
 #include <csignal>
 
 #include "detail/app_manager.h"
+#include "debug.h"
 #include "common.h"
 #include "registry.h"
 #include "detail/service.h"
@@ -44,13 +45,13 @@
             });
 
         foreach (QString r, result) {
-            qDebug() << "PEER: " << r;
+            TRACE() << "PEER: " << r;
         }
     }
 
     void shutdown(int sig)
     {
-        qDebug() << Q_FUNC_INFO << sig;
+        TRACE() << Q_FUNC_INFO << sig;
         QCoreApplication::instance()->quit();
     }
 }
@@ -60,6 +61,16 @@
     int ret = 0;
     QCoreApplication *app = new QCoreApplication(argc, argv);
 
+    /* read environment variables */
+    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
+    if (environment.contains(QLatin1String("CONTENT_HUB_LOGGING_LEVEL"))) {
+        bool isOk;
+        int value = environment.value(
+            QLatin1String("CONTENT_HUB_LOGGING_LEVEL")).toInt(&isOk);
+        if (isOk)
+            setLoggingLevel(value);
+    }
+
     auto connection = QDBusConnection::sessionBus();
 
     auto registry = QSharedPointer<cucd::PeerRegistry>(new Registry());
@@ -96,7 +107,7 @@
         ret = app->exec();
     }
 
-    qDebug() << "Server exiting, cleaning up";
+    TRACE() << "Server exiting, cleaning up";
     delete server;
     return ret;
 }
 
=== modified file 'src/com/ubuntu/content/service/registry.cpp'
--- src/com/ubuntu/content/service/registry.cpp	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/service/registry.cpp	2014-03-21 00:29:34 +0000
@@ -16,6 +16,7 @@
  * Authored by: Ken VanDine <[e-mail]>
  */
 
+#include "debug.h"
 #include "registry.h"
 #include "utils.cpp"
 #include <upstart-app-launch.h>
@@ -54,7 +55,7 @@
 
 cuc::Peer Registry::default_source_for_type(cuc::Type type)
 {
-    qDebug() << Q_FUNC_INFO << type.id();
+    TRACE() << Q_FUNC_INFO << type.id();
     if (m_defaultSources->keys().contains(type.id()))
     {
         QStringList as(m_defaultSources->get(type.id()).toStringList());
@@ -72,32 +73,32 @@
 
 void Registry::enumerate_known_peers(const std::function<void(const cuc::Peer&)>&for_each)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
 
     Q_FOREACH (QString type_id, m_sources->keys())
     {
-        qDebug() << Q_FUNC_INFO << type_id;
+        TRACE() << Q_FUNC_INFO << type_id;
         Q_FOREACH (QString k, m_sources->get(type_id).toStringList())
         {
-            qDebug() << Q_FUNC_INFO << k;
+            TRACE() << Q_FUNC_INFO << k;
             for_each(cuc::Peer{k});
         }
     }
     Q_FOREACH (QString type_id, m_dests->keys())
     {
-        qDebug() << Q_FUNC_INFO << type_id;
+        TRACE() << Q_FUNC_INFO << type_id;
         Q_FOREACH (QString k, m_dests->get(type_id).toStringList())
         {
-            qDebug() << Q_FUNC_INFO << k;
+            TRACE() << Q_FUNC_INFO << k;
             for_each(cuc::Peer{k});
         }
     }
     Q_FOREACH (QString type_id, m_shares->keys())
     {
-        qDebug() << Q_FUNC_INFO << type_id;
+        TRACE() << Q_FUNC_INFO << type_id;
         Q_FOREACH (QString k, m_shares->get(type_id).toStringList())
         {
-            qDebug() << Q_FUNC_INFO << k;
+            TRACE() << Q_FUNC_INFO << k;
             for_each(cuc::Peer{k});
         }
     }
@@ -105,14 +106,14 @@
 
 void Registry::enumerate_known_sources_for_type(cuc::Type type, const std::function<void(const cuc::Peer&)>&for_each)
 {
-    qDebug() << Q_FUNC_INFO << type.id();
+    TRACE() << Q_FUNC_INFO << type.id();
 
     if (type == cuc::Type::unknown())
         return;
 
     Q_FOREACH (QString k, m_sources->get(type.id()).toStringList())
     {
-        qDebug() << Q_FUNC_INFO << k;
+        TRACE() << Q_FUNC_INFO << k;
         bool defaultPeer = false;
         QStringList as(m_defaultSources->get(type.id()).toStringList());
         if (!as.isEmpty())
@@ -128,31 +129,31 @@
 
 void Registry::enumerate_known_destinations_for_type(cuc::Type type, const std::function<void(const cuc::Peer&)>&for_each)
 {
-    qDebug() << Q_FUNC_INFO << type.id();
+    TRACE() << Q_FUNC_INFO << type.id();
     Q_FOREACH (QString k, m_dests->get(type.id()).toStringList())
     {
-        qDebug() << Q_FUNC_INFO << k;
+        TRACE() << Q_FUNC_INFO << k;
         for_each(cuc::Peer{k});
     }
 }
 
 void Registry::enumerate_known_shares_for_type(cuc::Type type, const std::function<void(const cuc::Peer&)>&for_each)
 {
-    qDebug() << Q_FUNC_INFO << type.id();
+    TRACE() << Q_FUNC_INFO << type.id();
 
     Q_FOREACH (QString k, m_shares->get(type.id()).toStringList())
     {
-        qDebug() << Q_FUNC_INFO << k;
+        TRACE() << Q_FUNC_INFO << k;
         for_each(cuc::Peer{k});
     }
 }
 
 bool Registry::install_default_source_for_type(cuc::Type type, cuc::Peer peer)
 {
-    qDebug() << Q_FUNC_INFO << "type:" << type.id() << "peer:" << peer.id();
+    TRACE() << Q_FUNC_INFO << "type:" << type.id() << "peer:" << peer.id();
     if (m_defaultSources->keys().contains(type.id()))
     {
-        qDebug() << Q_FUNC_INFO << "Default peer for" << type.id() << "already installed.";
+        TRACE() << Q_FUNC_INFO << "Default peer for" << type.id() << "already installed.";
         return false;
     }
 
@@ -162,7 +163,7 @@
 
 bool Registry::install_source_for_type(cuc::Type type, cuc::Peer peer)
 {
-    qDebug() << Q_FUNC_INFO << "type:" << type.id() << "peer:" << peer.id();
+    TRACE() << Q_FUNC_INFO << "type:" << type.id() << "peer:" << peer.id();
     QStringList l = m_sources->get(type.id()).toStringList();
     if (not l.contains(peer.id()))
     {
@@ -174,7 +175,7 @@
 
 bool Registry::install_destination_for_type(cuc::Type type, cuc::Peer peer)
 {
-    qDebug() << Q_FUNC_INFO << "type:" << type.id() << "peer:" << peer.id();
+    TRACE() << Q_FUNC_INFO << "type:" << type.id() << "peer:" << peer.id();
     QStringList l = m_dests->get(type.id()).toStringList();
     if (not l.contains(peer.id()))
     {
@@ -186,7 +187,7 @@
 
 bool Registry::install_share_for_type(cuc::Type type, cuc::Peer peer)
 {
-    qDebug() << Q_FUNC_INFO << "type:" << type.id() << "peer:" << peer.id();
+    TRACE() << Q_FUNC_INFO << "type:" << type.id() << "peer:" << peer.id();
     QStringList l = m_shares->get(type.id()).toStringList();
     if (not l.contains(peer.id()))
     {
@@ -198,7 +199,7 @@
 
 bool Registry::remove_peer(cuc::Peer peer)
 {
-    qDebug() << Q_FUNC_INFO << "peer:" << peer.id();
+    TRACE() << Q_FUNC_INFO << "peer:" << peer.id();
     bool ret = false;
     Q_FOREACH (QString type_id, m_sources->keys())
     {
 
=== modified file 'src/com/ubuntu/content/service/registry.h'
--- src/com/ubuntu/content/service/registry.h	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/service/registry.h	2014-03-21 00:29:34 +0000
@@ -20,7 +20,6 @@
 #define REGISTRY_H
 
 #include <QGSettings/QGSettings>
-#include <QDebug>
 #include <com/ubuntu/content/peer.h>
 #include <com/ubuntu/content/type.h>
 #include "detail/peer_registry.h"
 
=== modified file 'src/com/ubuntu/content/transfer.cpp'
--- src/com/ubuntu/content/transfer.cpp	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/transfer.cpp	2014-03-21 00:29:34 +0000
@@ -43,7 +43,7 @@
 
 cuc::Transfer::~Transfer()
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     purge_store_cache(d->store().uri());
 }
 
 
=== modified file 'src/com/ubuntu/content/utils.cpp'
--- src/com/ubuntu/content/utils.cpp	2014-03-21 00:29:33 +0000
+++ src/com/ubuntu/content/utils.cpp	2014-03-21 00:29:34 +0000
@@ -27,6 +27,7 @@
 #include <nih-dbus/dbus_util.h>
 
 #include "common.h"
+#include "debug.h"
 #include "com/ubuntu/content/type.h"
 
 namespace cuc = com::ubuntu::content;
@@ -46,7 +47,7 @@
 /* sanitize the dbus names */
 QString sanitize_id(const QString& appId)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     return QString(nih_dbus_path(NULL,
                                  "",
                                  appId.toLocal8Bit().data(),
@@ -80,7 +81,7 @@
 
 QString aa_profile(QString uniqueConnectionId)
 {
-    qDebug() << Q_FUNC_INFO << uniqueConnectionId;
+    TRACE() << Q_FUNC_INFO << uniqueConnectionId;
     QDBusMessage msg =
         QDBusMessage::createMethodCall("org.freedesktop.DBus",
                                        "/org/freedesktop/DBus",
@@ -94,7 +95,7 @@
         QDBusConnection::sessionBus().call(msg, QDBus::Block);
     if (reply.type() == QDBusMessage::ReplyMessage) {
         aaProfile = reply.arguments().value(0, QString()).toString();
-        qDebug() << "AppArmor Profile:" << aaProfile;
+        TRACE() << "AppArmor Profile:" << aaProfile;
     } else {
         qWarning() << "Error getting app ID:" << reply.errorName() <<
             reply.errorMessage();
@@ -109,7 +110,7 @@
 
 QString copy_to_store(const QString& src, const QString& store)
 {
-    qDebug() << Q_FUNC_INFO;
+    TRACE() << Q_FUNC_INFO;
     QUrl srcUrl(src);
     if (not srcUrl.isLocalFile())
         return srcUrl.url();
@@ -120,7 +121,7 @@
     if (not st.exists())
         st.mkpath(st.absolutePath());
     QString destFilePath = store + QDir::separator() + fi.fileName();
-    qDebug() << Q_FUNC_INFO << destFilePath;
+    TRACE() << Q_FUNC_INFO << destFilePath;
     bool result = QFile::copy(fi.filePath(), destFilePath);
     if (not result)
     {
@@ -132,7 +133,7 @@
 
 bool is_persistent(QString store)
 {
-    qDebug() << Q_FUNC_INFO << store;
+    TRACE() << Q_FUNC_INFO << store;
     QRegExp rx("*.cache/*/HubIncoming/*");
     rx.setPatternSyntax(QRegExp::Wildcard);
     rx.setCaseSensitivity(Qt::CaseSensitive);
@@ -141,18 +142,18 @@
 
 bool purge_store_cache(QString store)
 {
-    qDebug() << Q_FUNC_INFO << "Store:" << store;
+    TRACE() << Q_FUNC_INFO << "Store:" << store;
 
     if (is_persistent(store))
     {
-        qDebug() << Q_FUNC_INFO << store << "is persistent";
+        TRACE() << Q_FUNC_INFO << store << "is persistent";
         return false;
     }
 
     QDir st(store);
     if (st.exists())
     {
-        qDebug() << Q_FUNC_INFO << store << "isn't persistent, purging";
+        TRACE() << Q_FUNC_INFO << store << "isn't persistent, purging";
         return st.removeRecursively();
     }