Logging: add a D-Bus specific logging category

Change-Id: I591b838234c791d18f4a7d5bfd4fdd6998dd654d
Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
(cherry picked from commit b44ca96b7fbf0f640d9e2858474282b21295a194)
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

4 files changed, 10 insertions, 8 deletions

diff --git a/src/common-lib/logging.cpp b/src/common-lib/logging.cpp
index c3e252d8..302511ad 100644
--- a/src/common-lib/logging.cpp
+++ b/src/common-lib/logging.cpp
@@ -122,6 +122,7 @@ QDLT_LOGGING_CATEGORY(LogNotifications, "am.notify", "NTFY", "Notifications sub-
 QDLT_LOGGING_CATEGORY(LogDeployment, "am.deployment", "DPLM", "Deployment hints")
 QDLT_LOGGING_CATEGORY(LogIntents, "am.intent", "INTN", "Intents sub-system messages")
 QDLT_LOGGING_CATEGORY(LogCache, "am.cache", "CACH", "Cache sub-system messages")
+QDLT_LOGGING_CATEGORY(LogDBus, "am.dbus", "DBUS", "D-Bus related messages")
 QDLT_LOGGING_CATEGORY(LogGeneral, "general", "GEN", "Messages without dedicated context ID (fallback)")
 QDLT_FALLBACK_CATEGORY(LogGeneral)
 
diff --git a/src/common-lib/logging.h b/src/common-lib/logging.h
index 3d6f0d2b..938ab429 100644
--- a/src/common-lib/logging.h
+++ b/src/common-lib/logging.h
@@ -24,6 +24,7 @@ Q_DECLARE_LOGGING_CATEGORY(LogQmlRuntime)
 Q_DECLARE_LOGGING_CATEGORY(LogDeployment)
 Q_DECLARE_LOGGING_CATEGORY(LogIntents)
 Q_DECLARE_LOGGING_CATEGORY(LogCache)
+Q_DECLARE_LOGGING_CATEGORY(LogDBus)
 
 class Logging
 {
diff --git a/src/dbus-lib/dbusdaemon.cpp b/src/dbus-lib/dbusdaemon.cpp
index 01690890..dda54d0b 100644
--- a/src/dbus-lib/dbusdaemon.cpp
+++ b/src/dbus-lib/dbusdaemon.cpp
@@ -101,8 +101,8 @@ void DBusDaemonProcess::start() noexcept(false)
     QByteArray busAddress = dbusDaemon->readAllStandardOutput().trimmed();
 
     qputenv("DBUS_SESSION_BUS_ADDRESS", busAddress);
-    qCInfo(LogSystem, "NOTICE: running on private D-Bus session bus to avoid conflicts:");
-    qCInfo(LogSystem, "        DBUS_SESSION_BUS_ADDRESS=%s", busAddress.constData());
+    qCInfo(LogDBus, "NOTICE: running on private D-Bus session bus to avoid conflicts:");
+    qCInfo(LogDBus, "        DBUS_SESSION_BUS_ADDRESS=%s", busAddress.constData());
 }
 
 QT_END_NAMESPACE_AM
diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp
index 5c0111c9..b0386b6d 100644
--- a/src/main-lib/main.cpp
+++ b/src/main-lib/main.cpp
@@ -938,13 +938,13 @@ void Main::setupDBus(const std::function<QString(const char *)> &busForInterface
             StartupTimer::instance()->checkpoint("after starting session D-Bus");
         } catch (const Exception &e) {
 #  if defined(Q_OS_LINUX)
-            qCWarning(LogSystem) << "Disabling external D-Bus interfaces:" << e.what();
+            qCWarning(LogDBus) << "Disabling external D-Bus interfaces:" << e.what();
             for (auto &&iface : ifaces)
                 std::get<1>(iface).clear();
             noneOnly = true;
 #  else
-            qCWarning(LogSystem) << "Could not start a private dbus-daemon:" << e.what();
-            qCWarning(LogSystem) << "Enabling DBus P2P access for appman-controller";
+            qCWarning(LogDBus) << "Could not start a private dbus-daemon:" << e.what();
+            qCInfo(LogDBus) << "Enabling DBus P2P access for appman-controller";
             for (auto &&iface : ifaces) {
                 QString &dbusName = std::get<1>(iface);
                 if (dbusName == u"auto")
@@ -955,7 +955,7 @@ void Main::setupDBus(const std::function<QString(const char *)> &busForInterface
     }
 
     if (!noneOnly) {
-        qCDebug(LogSystem) << "Registering D-Bus services:";
+        qCDebug(LogDBus) << "Registering D-Bus services:";
 
         for (auto &&iface : ifaces) {
             auto *generatedAdaptor = std::get<0>(iface)->generatedAdaptor<QDBusAbstractAdaptor>();
@@ -1025,7 +1025,7 @@ QString Main::registerDBusObject(QDBusAbstractAdaptor *adaptor, QString dbusName
                 m_p2pFailed = true;
                 delete m_p2pServer;
                 m_p2pServer = nullptr;
-                qCCritical(LogSystem) << "Failed to create a P2P DBus server for appman-controller";
+                qCCritical(LogDBus) << "Failed to create a P2P DBus server for appman-controller";
             } else {
                 QObject::connect(m_p2pServer, &QDBusServer::newConnection,
                                  this, [this](const QDBusConnection &conn) {
@@ -1067,7 +1067,7 @@ QString Main::registerDBusObject(QDBusAbstractAdaptor *adaptor, QString dbusName
         adaptor->parent()->parent()->setProperty("_am_dbus_address", dbusAddress);
     }
 
-    qCDebug(LogSystem).nospace().noquote() << " * " << serviceName << path << " [on bus: " << dbusName << "]";
+    qCDebug(LogDBus).nospace().noquote() << " * " << serviceName << path << " [on bus: " << dbusName << "]";
 
     return dbusAddress.isEmpty() ? dbusName : dbusAddress;
 #else