Merge lp:~mardy/online-accounts-api/debug-1638166 into lp:online-accounts-api

[Alberto Mardegan]

Disable debug output by default

Use QT logging by category functionality, so that logging can be turned on by either an environment variable or via a config file.

Disable debug output by default

Use QT logging by category functionality, so that logging can be turned on by either an environment variable or via a config file.

[Alexandre Abreu (abreu-alexandre)]

LGTM

review: Approve

=== modified file 'src/lib/OnlineAccounts/CMakeLists.txt'
--- src/lib/OnlineAccounts/CMakeLists.txt	2015-09-03 13:28:30 +0000
+++ src/lib/OnlineAccounts/CMakeLists.txt	2016-11-01 11:05:36 +0000
@@ -8,6 +8,10 @@
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
+add_definitions(
+    -DBUILDING_ONLINE_ACCOUNTS
+)
+
 add_library(${CLIENT_LIB} SHARED
     account.cpp
     account_info.cpp
 
=== modified file 'src/lib/OnlineAccounts/authentication_reply.cpp'
--- src/lib/OnlineAccounts/authentication_reply.cpp	2016-01-13 14:23:12 +0000
+++ src/lib/OnlineAccounts/authentication_reply.cpp	2016-11-01 11:05:36 +0000
@@ -50,7 +50,8 @@
                 return QVariant::fromValue(arrayList);
             } else {
                 /* We don't know how to handle other types */
-                qWarning() << "unhandled type" << argument.currentSignature();
+                qCWarning(DBG_ONLINE_ACCOUNTS) << "unhandled type" <<
+                    argument.currentSignature();
                 return argument.asVariant();
             }
         } else {
@@ -133,7 +134,7 @@
     } else {
         qFatal("Unknown invoked method %d", invokedMethod);
     }
-    qDebug() << "reply data:" << m_replyData;
+    qCDebug(DBG_ONLINE_ACCOUNTS) << "reply data:" << m_replyData;
 }
 
 AuthenticationReply::AuthenticationReply(const PendingCall &call):
@@ -264,7 +265,7 @@
     case ONLINE_ACCOUNTS_AUTH_SASL_STATE_FINISHED: return Finished;
     case ONLINE_ACCOUNTS_AUTH_SASL_STATE_CONTINUE: return Continue;
     default:
-        qWarning() << "Unknown SASL state" << state;
+        qCWarning(DBG_ONLINE_ACCOUNTS) << "Unknown SASL state" << state;
         return Finished;
     }
 }
 
=== modified file 'src/lib/OnlineAccounts/global.h'
--- src/lib/OnlineAccounts/global.h	2016-01-13 14:23:12 +0000
+++ src/lib/OnlineAccounts/global.h	2016-11-01 11:05:36 +0000
@@ -29,6 +29,11 @@
 #  define ONLINE_ACCOUNTS_EXPORT Q_DECL_IMPORT
 #endif
 
+#if defined(BUILDING_ONLINE_ACCOUNTS)
+#include <QLoggingCategory>
+Q_DECLARE_LOGGING_CATEGORY(DBG_ONLINE_ACCOUNTS)
+#endif
+
 namespace OnlineAccounts {
 
 typedef uint AccountId;
 
=== modified file 'src/lib/OnlineAccounts/manager.cpp'
--- src/lib/OnlineAccounts/manager.cpp	2016-07-22 05:08:06 +0000
+++ src/lib/OnlineAccounts/manager.cpp	2016-11-01 11:05:36 +0000
@@ -31,6 +31,8 @@
 
 using namespace OnlineAccounts;
 
+Q_LOGGING_CATEGORY(DBG_ONLINE_ACCOUNTS, "OnlineAccounts", QtWarningMsg)
+
 ManagerPrivate::ManagerPrivate(Manager *q, const QString &applicationId,
                                const QDBusConnection& bus):
     QObject(),
@@ -125,7 +127,8 @@
 
     QDBusPendingReply<QList<AccountInfo> > reply = *m_getAccountsCall;
     if (Q_UNLIKELY(reply.isError())) {
-        qWarning() << "GetAccounts call failed:" << reply.error();
+        qCWarning(DBG_ONLINE_ACCOUNTS) << "GetAccounts call failed:" <<
+            reply.error();
         /* No special handling of the error: the Manager will simply not have
          * any account */
     } else {
 
=== modified file 'src/lib/OnlineAccounts/request_access_reply.cpp'
--- src/lib/OnlineAccounts/request_access_reply.cpp	2015-03-04 10:01:32 +0000
+++ src/lib/OnlineAccounts/request_access_reply.cpp	2016-11-01 11:05:36 +0000
@@ -57,7 +57,8 @@
 
     if (Q_UNLIKELY(pCall->dbusCall().isError())) {
         /* Treat all errors as permission denied. */
-        qWarning() << "Error:" << pCall->dbusCall().error().message();
+        qCWarning(DBG_ONLINE_ACCOUNTS) << "Error:" <<
+            pCall->dbusCall().error().message();
         m_error = Error(Error::PermissionDenied,
                         pCall->dbusCall().error().message());
         return;