From 9372c6d524895ec285682f6c883ad8a432c02894 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Fri, 22 Dec 2017 11:37:15 +0100
Subject: [PATCH] align debug prints on shutdown

---
 libguh-core/cloudmanager.cpp                     |  1 -
 libguh-core/guhcore.cpp                          | 16 ++++++++++++++++
 .../network/upnp/upnpdiscoveryimplementation.cpp |  1 -
 libguh-core/hardwaremanagerimplementation.cpp    |  1 -
 libguh-core/logging/logengine.cpp                |  1 -
 libguh-core/ruleengine.cpp                       |  1 -
 libguh-core/tcpserver.cpp                        |  2 +-
 libguh-core/webserver.cpp                        |  2 +-
 libguh-core/websocketserver.cpp                  |  2 +-
 libguh/devicemanager.cpp                         |  1 -
 10 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/libguh-core/cloudmanager.cpp b/libguh-core/cloudmanager.cpp
index cf9f47d1..28bcc3fe 100644
--- a/libguh-core/cloudmanager.cpp
+++ b/libguh-core/cloudmanager.cpp
@@ -40,7 +40,6 @@ CloudManager::CloudManager(NetworkManager *networkManager, QObject *parent) : QO
 
 CloudManager::~CloudManager()
 {
-    qCDebug(dcApplication) << "Shutting down \"CloudManager\"";
 }
 
 void CloudManager::setServerUrl(const QString &serverUrl)
diff --git a/libguh-core/guhcore.cpp b/libguh-core/guhcore.cpp
index 0cc2c7b6..10357f78 100644
--- a/libguh-core/guhcore.cpp
+++ b/libguh-core/guhcore.cpp
@@ -123,7 +123,23 @@ GuhCore::~GuhCore()
     m_logger->logSystemEvent(m_timeManager->currentDateTime(), false);
 
     // Make sure DeviceManager is teared down at first so plugins don't access any ressources any more.
+    qCDebug(dcApplication) << "Shutting down \"Device Manager\"";
     delete m_deviceManager;
+
+    qCDebug(dcApplication) << "Shutting down \"Log Engine\"";
+    delete m_logger;
+
+    qCDebug(dcApplication()) << "Shutting down \"Hardware Manager\"";
+    delete m_hardwareManager;
+
+    qCDebug(dcApplication) << "Shutting down \"Rule Engine\"";
+    delete m_ruleEngine;
+
+    qCDebug(dcApplication) << "Shutting down \"Server Manager\"";
+    delete m_serverManager;
+
+    qCDebug(dcApplication) << "Shutting down \"CloudManager\"";
+    delete m_cloudManager;
 }
 
 /*! Destroyes the \l{GuhCore} instance. */
diff --git a/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp b/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp
index a8006b6e..99aacaee 100644
--- a/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp
+++ b/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp
@@ -73,7 +73,6 @@ UpnpDiscoveryImplementation::UpnpDiscoveryImplementation(QNetworkAccessManager *
 /*! Destruct this \l{UpnpDiscoveryImplementation} object. */
 UpnpDiscoveryImplementation::~UpnpDiscoveryImplementation()
 {
-    qCDebug(dcApplication) << "Shutting down \"UPnP Server\"";
     sendByeByeMessage();
     if (m_socket) {
         m_socket->waitForBytesWritten(1000);
diff --git a/libguh-core/hardwaremanagerimplementation.cpp b/libguh-core/hardwaremanagerimplementation.cpp
index bbbdf5ec..a42890d3 100644
--- a/libguh-core/hardwaremanagerimplementation.cpp
+++ b/libguh-core/hardwaremanagerimplementation.cpp
@@ -86,7 +86,6 @@ HardwareManagerImplementation::HardwareManagerImplementation(QObject *parent) :
 
 HardwareManagerImplementation::~HardwareManagerImplementation()
 {
-    qCDebug(dcApplication()) << "Shutting down Hardware Manager";
 }
 
 Radio433 *HardwareManagerImplementation::radio433()
diff --git a/libguh-core/logging/logengine.cpp b/libguh-core/logging/logengine.cpp
index 3b4c3a52..7338e275 100644
--- a/libguh-core/logging/logengine.cpp
+++ b/libguh-core/logging/logengine.cpp
@@ -174,7 +174,6 @@ LogEngine::LogEngine(const QString &logPath, QObject *parent):
 /*! Destructs the \l{LogEngine}. */
 LogEngine::~LogEngine()
 {
-    qCDebug(dcApplication) << "Shutting down \"Log Engine\"";
     m_db.close();
 }
 
diff --git a/libguh-core/ruleengine.cpp b/libguh-core/ruleengine.cpp
index 9235e356..3b8150a6 100644
--- a/libguh-core/ruleengine.cpp
+++ b/libguh-core/ruleengine.cpp
@@ -322,7 +322,6 @@ RuleEngine::RuleEngine(QObject *parent) :
 /*! Destructor of the \l{RuleEngine}. */
 RuleEngine::~RuleEngine()
 {
-    qCDebug(dcApplication) << "Shutting down \"Rule Engine\"";
 }
 
 /*! Ask the Engine to evaluate all the rules for the given \a event.
diff --git a/libguh-core/tcpserver.cpp b/libguh-core/tcpserver.cpp
index 2c90b768..c3fa99a1 100644
--- a/libguh-core/tcpserver.cpp
+++ b/libguh-core/tcpserver.cpp
@@ -57,7 +57,7 @@ TcpServer::TcpServer(const ServerConfiguration &configuration, const QSslConfigu
 /*! Destructor of this \l{TcpServer}. */
 TcpServer::~TcpServer()
 {
-    qCDebug(dcApplication) << "Shutting down \"TCP Server\"" << serverUrl().toString();
+    qCDebug(dcTcpServer()) << "Shutting down \"TCP Server\"" << serverUrl().toString();
     stopServer();
 }
 
diff --git a/libguh-core/webserver.cpp b/libguh-core/webserver.cpp
index b1a816ee..164e3667 100644
--- a/libguh-core/webserver.cpp
+++ b/libguh-core/webserver.cpp
@@ -115,7 +115,7 @@ WebServer::WebServer(const WebServerConfiguration &configuration, const QSslConf
 /*! Destructor of this \l{WebServer}. */
 WebServer::~WebServer()
 {
-    qCDebug(dcApplication) << "Shutting down \"Webserver\"" << serverUrl().toString();
+    qCDebug(dcWebServer()) << "Shutting down \"Webserver\"" << serverUrl().toString();
 
     this->close();
 }
diff --git a/libguh-core/websocketserver.cpp b/libguh-core/websocketserver.cpp
index 13159c9d..7f681f8a 100644
--- a/libguh-core/websocketserver.cpp
+++ b/libguh-core/websocketserver.cpp
@@ -73,7 +73,7 @@ WebSocketServer::WebSocketServer(const ServerConfiguration &configuration, const
 /*! Destructor of this \l{WebSocketServer}. */
 WebSocketServer::~WebSocketServer()
 {
-    qCDebug(dcApplication) << "Shutting down \"Websocket server\"" << serverUrl().toString();
+    qCDebug(dcWebSocketServer()) << "Shutting down \"Websocket server\"" << serverUrl().toString();
     stopServer();
 }
 
diff --git a/libguh/devicemanager.cpp b/libguh/devicemanager.cpp
index 7842edc0..9456bb40 100644
--- a/libguh/devicemanager.cpp
+++ b/libguh/devicemanager.cpp
@@ -218,7 +218,6 @@ DeviceManager::DeviceManager(HardwareManager *hardwareManager, const QLocale &lo
 /*! Destructor of the DeviceManager. Each loaded \l{DevicePlugin} will be deleted. */
 DeviceManager::~DeviceManager()
 {
-    qCDebug(dcApplication) << "Shutting down \"Device Manager\"";
     foreach (Device *device, m_configuredDevices) {
         storeDeviceStates(device);
     }