Log.category for DBus server

src/blackmisc/dbusserver.cpp

@@ -109,6 +109,12 @@ namespace BlackMisc
         return CDBusServer::isP2PConnection(connection) ? empty : CDBusServer::coreServiceName();
     }
 
+    const CLogCategoryList &CDBusServer::getLogCategories()
+    {
+        static const CLogCategoryList cats({ CLogCategory::dbus() });
+        return cats;
+    }
+
     bool CDBusServer::isP2PAddress(const QString &address)
     {
         return modeOfAddress(address) == SERVERMODE_P2P;

src/blackmisc/dbusserver.h

@@ -11,6 +11,7 @@
 #ifndef BLACKMISC_DBUSSERVER_H
 #define BLACKMISC_DBUSSERVER_H
 
+#include "blackmisc/logcategorylist.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QDBusConnection>
@@ -46,6 +47,9 @@ namespace BlackMisc
         //! Service name, empty if is P2P connection
         static const QString &coreServiceName(const QDBusConnection &connection);
 
+        //! Log categories
+        static const CLogCategoryList &getLogCategories();
+
         //! Server mode
         enum ServerMode
         {
@@ -61,7 +65,7 @@ namespace BlackMisc
         CDBusServer(const QString &service, const QString &address, QObject *parent = nullptr);
 
         //! Destructor
-        virtual ~CDBusServer();
+        virtual ~CDBusServer() override;
 
         //! Add a QObject to be exposed via DBus
         void addObject(const QString &name, QObject *object);

src/blackmisc/logcategory.h

@@ -67,6 +67,13 @@ namespace BlackMisc
             return cat;
         }
 
+        //! DBus related
+        static const CLogCategory &dbus()
+        {
+            static const CLogCategory cat { "swift.dbus" };
+            return cat;
+        }
+
         //! Contexts
         static const CLogCategory &context()
         {
@@ -297,6 +304,7 @@ namespace BlackMisc
                 cmdLine(),
                 context(),
                 contextSlot(),
+                dbus(),
                 dataInconsistency(),
                 download(),
                 driver(),

src/blackmisc/logpattern.cpp

@@ -28,6 +28,7 @@ namespace BlackMisc
             { "cache",                       exactMatch(CLogCategory::cache()) },
             { "cmd.line handling",           exactMatch(CLogCategory::cmdLine()) },
             { "data inconsistency",          exactMatch(CLogCategory::dataInconsistency()) },
+            { "DBus",                        exactMatch(CLogCategory::dbus()) },
             { "downloading data",            exactMatch(CLogCategory::download()) },
             { "driver",                      exactMatch(CLogCategory::driver()) },
             { "flight plan",                 exactMatch(CLogCategory::flightPlan()) },

src/xswiftbus/dbusserver.cpp

@@ -1,4 +1,3 @@
-#include <utility>
 
 /* Copyright (C) 2018
  * swift project Community / Contributors
@@ -12,6 +11,7 @@
 #include "dbusobject.h"
 #include "utils.h"
 
+#include <utility>
 #include <algorithm>
 #include <cassert>
 #include <memory>