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

Merge pull request #4 from guh/try-manual-close

Browse Source 
Try to manually close the socket in any case
This commit is contained in:
Michael Zanetti 2019-04-16 12:20:45 +02:00 committed by GitHub
commit 138dbc96a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libnymea-remoteproxy/websocketserver.cpp
View File

@ -118,6 +118,9 @@ void WebSocketServer::onClientDisconnected()
qCDebug(dcWebSocketServer()) << "Client disconnected:" << client << client->peerAddress().toString() << clientId.toString() << client->closeReason(); qCDebug(dcWebSocketServer()) << "Client disconnected:" << client << client->peerAddress().toString() << clientId.toString() << client->closeReason();
// Manually close it in any case
client->close();
m_clientList.take(clientId)->deleteLater(); m_clientList.take(clientId)->deleteLater();
emit clientDisconnected(clientId); emit clientDisconnected(clientId);
} }
@ -148,9 +151,9 @@ void WebSocketServer::onAcceptError(QAbstractSocket::SocketError error)
qCWarning(dcWebSocketServer()) << "Server accept error occurred:" << error << m_server->errorString(); qCWarning(dcWebSocketServer()) << "Server accept error occurred:" << error << m_server->errorString();
} }
void WebSocketServer::onServerError(QAbstractSocket::SocketError error) void WebSocketServer::onServerError(QWebSocketProtocol::CloseCode closeCode)
{ {
qCWarning(dcWebSocketServer()) << "Server error occurred:" << error << m_server->errorString(); qCWarning(dcWebSocketServer()) << "Server error occurred:" << closeCode << m_server->errorString();
} }
bool WebSocketServer::startServer() bool WebSocketServer::startServer()

2
libnymea-remoteproxy/websocketserver.h
View File

@ -65,7 +65,7 @@ private slots:
void onBinaryMessageReceived(const QByteArray &data); void onBinaryMessageReceived(const QByteArray &data);
void onClientError(QAbstractSocket::SocketError error); void onClientError(QAbstractSocket::SocketError error);
void onAcceptError(QAbstractSocket::SocketError error); void onAcceptError(QAbstractSocket::SocketError error);
void onServerError(QAbstractSocket::SocketError error); void onServerError(QWebSocketProtocol::CloseCode closeCode);
public slots: public slots:
bool startServer() override; bool startServer() override;