ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #248: Disconnect all slots of nymea:core on shutdown

pull/263/head
Jenkins nymea 2020-01-29 21:44:34 +01:00
parent ace4c70fe4 de0395f115
commit b7ac4ec806
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libnymea-core/nymeacore.cpp
View File

@ -221,12 +221,13 @@ void NymeaCore::init() {
/*! Destructor of the \l{NymeaCore}. */
NymeaCore::~NymeaCore()
{
qCDebug(dcApplication()) << "Shutting down NymeaCore";
m_logger->logSystemEvent(m_timeManager->currentDateTime(), false);
// Disconnect everything that could still spawn events
disconnect(m_deviceManager);
disconnect(m_ruleEngine);
disconnect(m_timeManager);
// Disconnect all signals/slots, we're going down now
m_timeManager->disconnect(this);
m_deviceManager->disconnect(this);
m_ruleEngine->disconnect(this);
// At very first, cut off the outside world
qCDebug(dcApplication) << "Shutting down \"Server Manager\"";

2
tests/testlib/nymeatestbase.cpp
View File

@ -62,7 +62,7 @@ void NymeaTestBase::initTestCase()
NymeaSettings nymeadSettings(NymeaSettings::SettingsRoleGlobal);
nymeadSettings.clear();
QLoggingCategory::setFilterRules("*.debug=false\nTests.debug=true\nMockDevice.debug=true");
QLoggingCategory::setFilterRules("*.debug=false\nApplication.debug=true\nTests.debug=true\nMockDevice.debug=true");
// Start the server
qCDebug(dcTests()) << "Setting up nymea core instance";