ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jenkins nymea 2020-01-22 23:47:15 +01:00
commit 5cbace14bf
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}. */ /*! Destructor of the \l{NymeaCore}. */
NymeaCore::~NymeaCore() NymeaCore::~NymeaCore()
{ {
qCDebug(dcApplication()) << "Shutting down NymeaCore";
m_logger->logSystemEvent(m_timeManager->currentDateTime(), false); m_logger->logSystemEvent(m_timeManager->currentDateTime(), false);
// Disconnect everything that could still spawn events // Disconnect all signals/slots, we're going down now
disconnect(m_deviceManager); m_timeManager->disconnect(this);
disconnect(m_ruleEngine); m_deviceManager->disconnect(this);
disconnect(m_timeManager); m_ruleEngine->disconnect(this);
// At very first, cut off the outside world // At very first, cut off the outside world
qCDebug(dcApplication) << "Shutting down \"Server Manager\""; qCDebug(dcApplication) << "Shutting down \"Server Manager\"";

2
tests/testlib/nymeatestbase.cpp
View File

@ -62,7 +62,7 @@ void NymeaTestBase::initTestCase()
NymeaSettings nymeadSettings(NymeaSettings::SettingsRoleGlobal); NymeaSettings nymeadSettings(NymeaSettings::SettingsRoleGlobal);
nymeadSettings.clear(); 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 // Start the server
qCDebug(dcTests()) << "Setting up nymea core instance"; qCDebug(dcTests()) << "Setting up nymea core instance";