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

Merge PR #613: Properly clean up the TCP server on shutdown

Browse Source
This commit is contained in:
jenkins 2023-02-21 17:43:26 +01:00
commit b17c3fa992
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-core/servers/tcpserver.cpp
View File

@ -176,7 +176,7 @@ void TcpServer::setServerName(const QString &serverName)
*/ */
bool TcpServer::startServer() bool TcpServer::startServer()
{ {
m_server = new SslServer(configuration().sslEnabled, m_sslConfig); m_server = new SslServer(configuration().sslEnabled, m_sslConfig, this);
if(!m_server->listen(QHostAddress(configuration().address), static_cast<quint16>(configuration().port))) { if(!m_server->listen(QHostAddress(configuration().address), static_cast<quint16>(configuration().port))) {
qCWarning(dcTcpServer()) << "Tcp server error: can not listen on" << configuration().address << configuration().port; qCWarning(dcTcpServer()) << "Tcp server error: can not listen on" << configuration().address << configuration().port;
delete m_server; delete m_server;
@ -207,7 +207,7 @@ bool TcpServer::stopServer()
} }
m_server->close(); m_server->close();
m_server->deleteLater(); delete m_server;
m_server = nullptr; m_server = nullptr;
return true; return true;
} }

2
libnymea-core/servers/websocketserver.cpp
View File

@ -240,7 +240,7 @@ bool WebSocketServer::stopServer()
if (m_server) { if (m_server) {
m_server->close(); m_server->close();
m_server->deleteLater(); delete m_server;
m_server = nullptr; m_server = nullptr;
} }
return true; return true;