Reorder shutdown
The server manager might be used by things, so we need to destroy things first
This commit is contained in:
parent
4ce5d773b0
commit
5e409be5b8
@ -174,12 +174,6 @@ NymeaCore::~NymeaCore()
|
|||||||
m_thingManager->disconnect(this);
|
m_thingManager->disconnect(this);
|
||||||
m_ruleEngine->disconnect(this);
|
m_ruleEngine->disconnect(this);
|
||||||
|
|
||||||
// At very first, cut off the outside world
|
|
||||||
qCDebug(dcCore) << "Shutting down \"Server Manager\"";
|
|
||||||
delete m_serverManager;
|
|
||||||
qCDebug(dcCore) << "Shutting down \"CloudManager\"";
|
|
||||||
delete m_cloudManager;
|
|
||||||
|
|
||||||
// Then stop magic from happening
|
// Then stop magic from happening
|
||||||
qCDebug(dcCore) << "Shutting down \"Rule Engine\"";
|
qCDebug(dcCore) << "Shutting down \"Rule Engine\"";
|
||||||
delete m_ruleEngine;
|
delete m_ruleEngine;
|
||||||
@ -188,13 +182,18 @@ NymeaCore::~NymeaCore()
|
|||||||
qCDebug(dcCore) << "Shutting down \"Thing Manager\"";
|
qCDebug(dcCore) << "Shutting down \"Thing Manager\"";
|
||||||
delete m_thingManager;
|
delete m_thingManager;
|
||||||
|
|
||||||
|
// Destroy resources used by things
|
||||||
|
qCDebug(dcCore) << "Shutting down \"Server Manager\"";
|
||||||
|
delete m_serverManager;
|
||||||
|
qCDebug(dcCore) << "Shutting down \"CloudManager\"";
|
||||||
|
delete m_cloudManager;
|
||||||
|
qCDebug(dcCore()) << "Shutting down \"Hardware Manager\"";
|
||||||
|
delete m_hardwareManager;
|
||||||
|
|
||||||
// Now go ahead and clean up stuff.
|
// Now go ahead and clean up stuff.
|
||||||
qCDebug(dcCore) << "Shutting down \"Log Engine\"";
|
qCDebug(dcCore) << "Shutting down \"Log Engine\"";
|
||||||
delete m_logger;
|
delete m_logger;
|
||||||
|
|
||||||
qCDebug(dcCore()) << "Shutting down \"Hardware Manager\"";
|
|
||||||
delete m_hardwareManager;
|
|
||||||
|
|
||||||
qCDebug(dcCore) << "Done shutting down NymeaCore";
|
qCDebug(dcCore) << "Done shutting down NymeaCore";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user