Add categorized logging.

sailfishos · Oct 1, 2016 · 079f026 · 079f026
1 parent e4d0ee9
commit 079f026
Show file tree

Hide file tree

Showing 18 changed files with 175 additions and 66 deletions.
diff --git a/src/nemo-devicelock/authenticator.cpp b/src/nemo-devicelock/authenticator.cpp
@@ -33,7 +33,7 @@
 #include "authenticator.h"
 #include "settingswatcher.h"
 
-#include <QDebug>
+#include "logging.h"
 
 namespace NemoDeviceLock
 {
@@ -186,6 +186,9 @@ void Authenticator::handleFeedback(Feedback feedback, int attemptsRemaining, Met
             utilizedMethods = m_utilizedMethods;
         }
 
+        qCDebug(devicelock, "Authentication feedback %i.  Attempts remaining: %i. Methods: %i",
+                    int(feedback), attemptsRemaining, int(utilizedMethods));
+
         const bool methodsChanged = m_utilizedMethods != utilizedMethods;
 
         m_utilizedMethods = utilizedMethods;
@@ -203,6 +206,8 @@ void Authenticator::handleError(Error error)
     if (m_authenticating) {
         m_authenticating = false;
 
+        qCDebug(devicelock, "Authentication error %i.", int(error));
+
         emit Authenticator::error(error);
         emit authenticatingChanged();
     }

diff --git a/src/nemo-devicelock/fingerprintsensor.cpp b/src/nemo-devicelock/fingerprintsensor.cpp
@@ -32,7 +32,7 @@
 
 #include "fingerprintsensor.h"
 
-#include <QDebug>
+#include "logging.h"
 
 QDBusArgument &operator<<(QDBusArgument &argument, const NemoDeviceLock::Fingerprint &fingerprint)
 {
@@ -204,6 +204,8 @@ void FingerprintSensorAdaptor::AcquisitionCompleted()
 
 void FingerprintSensorAdaptor::AcquisitionFeedback(uint feedback)
 {
+    qCDebug(devicelock, "Fingerprint acquisition feedback: %i", feedback);
+
     m_settings->acquisitionFeedback(FingerprintSensor::Feedback(feedback));
 }
 
@@ -307,13 +309,17 @@ FingerprintModel *FingerprintSensor::fingers()
 
 void FingerprintSensor::handleSampleAcquired(int samplesRemaining)
 {
+    qCDebug(devicelock, "Fingerprint sample acquired. Samples remaining: %i.", samplesRemaining);
+
     m_samplesRemaining = samplesRemaining;
 
     emit samplesRemainingChanged();
 }
 
 void FingerprintSensor::handleAcquisitionCompleted()
 {
+    qCDebug(devicelock, "Fingerprint acquisition complete.");
+
     m_samplesRemaining = 0;
     m_samplesRequired = 0;
     m_isAcquiring = false;
@@ -327,6 +333,8 @@ void FingerprintSensor::handleAcquisitionCompleted()
 
 void FingerprintSensor::handleError(Error error)
 {
+    qCDebug(devicelock, "Fingerprint acquisition error %i.", int(error));
+
     m_samplesRemaining = 0;
     m_samplesRequired = 0;
     m_isAcquiring = false;

diff --git a/src/nemo-devicelock/host/cli/cliauthenticator.cpp b/src/nemo-devicelock/host/cli/cliauthenticator.cpp
@@ -37,8 +37,6 @@
 
 #include <QDBusMessage>
 
-#include <QDebug>
-
 namespace NemoDeviceLock
 {
 

diff --git a/src/nemo-devicelock/host/cli/clidevicelock.cpp b/src/nemo-devicelock/host/cli/clidevicelock.cpp
@@ -37,8 +37,6 @@
 #include <QDBusConnection>
 #include <QDBusMessage>
 
-#include <QDebug>
-
 namespace NemoDeviceLock
 {
 

diff --git a/src/nemo-devicelock/host/cli/clilockcodesettings.cpp b/src/nemo-devicelock/host/cli/clilockcodesettings.cpp
@@ -37,8 +37,6 @@
 #include <QDBusConnection>
 #include <QDBusMessage>
 
-#include <QDebug>
-
 namespace NemoDeviceLock
 {
 

diff --git a/src/nemo-devicelock/host/cli/lockcodewatcher.cpp b/src/nemo-devicelock/host/cli/lockcodewatcher.cpp
@@ -36,7 +36,6 @@
 
 #include <QDBusConnection>
 #include <QDBusMessage>
-#include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
@@ -63,12 +62,12 @@ void PluginCommand::processFinished(int exitCode, QProcess::ExitStatus status)
 
     QByteArray output = readAllStandardOutput();
     if (!output.isEmpty()) {
-        qDebug() << output.constData();
+        qCDebug(daemon) << output.constData();
     }
 
     output = readAllStandardError();
     if (!output.isEmpty()) {
-        qWarning() << output.constData();
+        qCWarning(daemon) << output.constData();
     }
 
     if (!m_caller) {
@@ -91,7 +90,7 @@ static QString pluginName()
         const QString pluginName = settings.value(QStringLiteral("DeviceLock/pluginName")).toString();
 
         if (pluginName.isEmpty()) {
-            qWarning("DeviceLock: no plugin configuration set in /usr/share/lipstick/devicelock/devicelock.conf");
+            qCWarning(daemon, "DeviceLock: no plugin configuration set in /usr/share/lipstick/devicelock/devicelock.conf");
         }
 
         return pluginName;

diff --git a/src/nemo-devicelock/host/hostauthorization.cpp b/src/nemo-devicelock/host/hostauthorization.cpp
@@ -36,8 +36,6 @@
 
 #include <QDBusObjectPath>
 
-#include <QDebug>
-
 namespace NemoDeviceLock
 {
 

diff --git a/src/nemo-devicelock/host/hostlockcodesettings.cpp b/src/nemo-devicelock/host/hostlockcodesettings.cpp
@@ -32,8 +32,6 @@
 
 #include "hostlockcodesettings.h"
 
-#include <QDebug>
-
 namespace NemoDeviceLock
 {
 

diff --git a/src/nemo-devicelock/host/hostobject.cpp b/src/nemo-devicelock/host/hostobject.cpp
@@ -30,14 +30,15 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
  */
 
-
 #include "hostobject.h"
 
 #include "dbusutilities.h"
 
 namespace NemoDeviceLock
 {
 
+Q_LOGGING_CATEGORY(daemon, "org.nemomobile.devicelock.daemon")
+
 HostObject::HostObject(const QString &path, QObject *parent)
     : QObject(parent)
     , m_path(path)

diff --git a/src/nemo-devicelock/host/hostobject.h b/src/nemo-devicelock/host/hostobject.h
@@ -34,10 +34,13 @@
 #define NEMODEVICELOCK_HOSTOBJECT_H
 
 #include <QDBusContext>
+#include <QLoggingCategory>
 
 namespace NemoDeviceLock
 {
 
+Q_DECLARE_LOGGING_CATEGORY(daemon)
+
 class HostObject : public QObject, protected QDBusContext
 {
     Q_OBJECT

diff --git a/src/nemo-devicelock/host/hostservice.cpp b/src/nemo-devicelock/host/hostservice.cpp
@@ -45,8 +45,6 @@
 #include <QDBusMetaType>
 #include <QDir>
 
-#include <QDebug>
-
 #include <dbus/dbus.h>
 #include <systemd/sd-daemon.h>
 
@@ -107,7 +105,8 @@ HostService::HostService(
     qDBusRegisterMetaType<QVector<NemoDeviceLock::Fingerprint>>();
 
     if (!QDBusConnection::systemBus().registerService(QStringLiteral("org.nemomobile.devicelock"))) {
-        qDebug() << "Failed to register service org.nemomobile.devicelock" << QDBusConnection::systemBus().lastError();
+        qCWarning(daemon, "Failed to register service org.nemomobile.devicelock. %s",
+                    qPrintable(QDBusConnection::systemBus().lastError().message()));
     }
 
     sd_notify(0, "READY=1");
@@ -120,7 +119,7 @@ HostService::~HostService()
 static void registerObject(QDBusConnection &connection, const QString &path, QObject *object)
 {
     if (!connection.registerObject(path, object)) {
-        qWarning() << "Failed to register object on path" << path;
+        qCWarning(daemon, "Failed to register object on path %s", qPrintable(path));
     }
 }
 
@@ -144,7 +143,7 @@ void HostService::connectionReady(const QDBusConnection &newConnection)
                 SLOT(disconnected()))) {
         delete monitor;
 
-        qWarning() << "Failed to connect to disconnect signal";
+        qCWarning(daemon, "Failed to connect to disconnect signal");
     }
 
     const auto connectionName = newConnection.name();