Merge lp:~mardy/ubuntu-system-settings-online-accounts/logging-1570735 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Allow configuring verbosity level from configuration file

Allow configuring verbosity level from configuration file

NOTE: this works fine under xenial, where systemd captures the output of the processes activated by D-Bus and sends it to the syslog. On vivid, systemd is not doing that, so even if the LoggingLevel=2 option is given, the output will be lost, unless the program is started from the command line.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:349
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/291/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/1003/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/1003/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/291/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'online-accounts-service/main.cpp'
--- online-accounts-service/main.cpp	2015-09-02 14:54:04 +0000
+++ online-accounts-service/main.cpp	2016-04-15 08:27:43 +0000
@@ -32,6 +32,7 @@
 #include <QDBusMetaType>
 #include <QLibrary>
 #include <QProcessEnvironment>
+#include <QSettings>
 
 using namespace OnlineAccountsUi;
 
@@ -43,6 +44,8 @@
 {
     QCoreApplication app(argc, argv);
 
+    QSettings settings("online-accounts-service");
+
     /* read environment variables */
     QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
     if (environment.contains(QLatin1String("OAU_LOGGING_LEVEL"))) {
@@ -51,6 +54,8 @@
             QLatin1String("OAU_LOGGING_LEVEL")).toInt(&isOk);
         if (isOk)
             setLoggingLevel(value);
+    } else {
+        setLoggingLevel(settings.value("LoggingLevel", 1).toInt());
     }
 
     /* default daemonTimeout to 5 seconds */
@@ -63,6 +68,8 @@
             QLatin1String("OAU_DAEMON_TIMEOUT")).toInt(&isOk);
         if (isOk)
             daemonTimeout = value;
+    } else {
+        daemonTimeout = settings.value("DaemonTimeout", 5).toInt();
     }
 
     RequestManager *requestManager = new RequestManager();

=== modified file 'online-accounts-ui/main.cpp'
--- online-accounts-ui/main.cpp	2015-04-27 17:16:42 +0000
+++ online-accounts-ui/main.cpp	2016-04-15 08:27:43 +0000
@@ -26,6 +26,7 @@
 #include <QGuiApplication>
 #include <QLibrary>
 #include <QProcessEnvironment>
+#include <QSettings>
 #include <sys/apparmor.h>
 
 using namespace OnlineAccountsUi;
@@ -56,6 +57,8 @@
         }
     }
 
+    QSettings settings("online-accounts-service");
+
     /* read environment variables */
     QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
     if (environment.contains(QLatin1String("OAU_LOGGING_LEVEL"))) {
@@ -64,6 +67,8 @@
             QLatin1String("OAU_LOGGING_LEVEL")).toInt(&isOk);
         if (isOk)
             setLoggingLevel(value);
+    } else {
+        setLoggingLevel(settings.value("LoggingLevel", 1).toInt());
     }
 
     initTr(I18N_DOMAIN, NULL);