Merge lp:~online-accounts/accounts-qml-module/packaging into lp:accounts-qml-module

[Alberto Mardegan]

Hide debug messages by default

Introduce a OAQ_LOGGING_LEVEL variable which can be set to 2 in order to
enable debug messages (or to 0 to hide warnings too).

Hide debug messages by default

Introduce a OAQ_LOGGING_LEVEL variable which can be set to 2 in order to
enable debug messages (or to 0 to hide warnings too).

[lp:~online-accounts/accounts-qml-module/packaging]

61. By Alberto Mardegan on 2015-11-06

Hide debug messages by default

Introduce a OAQ_LOGGING_LEVEL variable which can be set to 2 in order to
enable debug messages (or to 0 to hide warnings too).

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-28 15:59:00 +0000
+++ debian/changelog	2015-11-04 07:30:22 +0000
@@ -1,3 +1,10 @@
+accounts-qml-module (0.6+16.04.20151028-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Merge from upstream:
+    - Hide debug messages by default (LP: #1404267)
+
+ -- Alberto Mardegan <[e-mail]>  Wed, 04 Nov 2015 10:15:57 +0300
+
 accounts-qml-module (0.6+16.04.20151028-0ubuntu1) xenial; urgency=medium
 
   [ Alberto Mardegan ]

=== added file 'src/debug.cpp'
--- src/debug.cpp	1970-01-01 00:00:00 +0000
+++ src/debug.cpp	2015-11-04 07:30:22 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 2.1.
+ *
+ * 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 accounts_qml_module_logging_level = 1;
+
+namespace OnlineAccounts {
+
+void setLoggingLevel(int level) {
+    accounts_qml_module_logging_level = level;
+}
+
+}

=== modified file 'src/debug.h'
--- src/debug.h	2013-05-31 06:46:13 +0000
+++ src/debug.h	2015-11-04 07:30:22 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2015 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -22,13 +22,28 @@
 #include <QDebug>
 
 #ifdef DEBUG_ENABLED
-    #define DEBUG() \
-        qDebug() << __FILE__ << __LINE__ << __func__
-    #define WARNING() \
-        qCritical() << __FILE__ << __LINE__ << __func__
-#else
+extern int accounts_qml_module_logging_level;
+static inline bool debugEnabled() {
+    return accounts_qml_module_logging_level >= 2;
+}
+
+static inline bool criticalsEnabled() {
+    return accounts_qml_module_logging_level >= 1;
+}
+#define DEBUG() \
+    if (debugEnabled()) qDebug()
+#define BLAME() \
+    if (criticalsEnabled()) qCritical()
+
+#else // DEBUG_ENABLED
     #define DEBUG() while (0) qDebug()
     #define WARNING() while (0) qDebug()
 #endif
 
+namespace OnlineAccounts {
+
+void setLoggingLevel(int level);
+
+}
+
 #endif // ONLINE_ACCOUNTS_DEBUG_H

=== modified file 'src/plugin.cpp'
--- src/plugin.cpp	2013-06-13 07:44:44 +0000
+++ src/plugin.cpp	2015-11-04 07:30:22 +0000
@@ -21,6 +21,7 @@
 #include "account.h"
 #include "application-model.h"
 #include "credentials.h"
+#include "debug.h"
 #include "manager.h"
 #include "plugin.h"
 #include "provider-model.h"
@@ -40,7 +41,11 @@
 
 void Plugin::registerTypes(const char *uri)
 {
-    qDebug() << Q_FUNC_INFO << uri;
+    QByteArray loggingLevelVar = qgetenv("OAQ_LOGGING_LEVEL");
+    if (!loggingLevelVar.isEmpty()) {
+        setLoggingLevel(loggingLevelVar.toInt());
+    }
+    DEBUG() << Q_FUNC_INFO << uri;
     qmlRegisterType<AccountServiceModel>(uri, 0, 1, "AccountServiceModel");
     qmlRegisterType<AccountService>(uri, 0, 1, "AccountService");
     qmlRegisterType<Account>(uri, 0, 1, "Account");

=== modified file 'src/src.pro'
--- src/src.pro	2013-10-09 09:23:13 +0000
+++ src/src.pro	2015-11-04 07:30:22 +0000
@@ -33,6 +33,7 @@
     application-model.cpp \
     application.cpp \
     credentials.cpp \
+    debug.cpp \
     manager.cpp \
     plugin.cpp \
     provider-model.cpp