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

fix reconnection

Browse Source
This commit is contained in:
Simon Stürz 2016-10-11 11:35:39 +02:00 committed by Michael Zanetti
parent 62948a8229
commit 8045b5a0e7
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/cloud/cloudconnection.cpp
View File

@ -50,7 +50,6 @@ CloudConnection::CloudConnection(QObject *parent) :
m_pingResponseTimer->setInterval(5000); m_pingResponseTimer->setInterval(5000);
connect(m_pingResponseTimer, &QTimer::timeout, this, &CloudConnection::onPongTimeout); connect(m_pingResponseTimer, &QTimer::timeout, this, &CloudConnection::onPongTimeout);
m_connection = new QWebSocket("guhd", QWebSocketProtocol::Version13, this); m_connection = new QWebSocket("guhd", QWebSocketProtocol::Version13, this);
connect(m_connection, SIGNAL(connected()), this, SLOT(onConnected())); connect(m_connection, SIGNAL(connected()), this, SLOT(onConnected()));
connect(m_connection, SIGNAL(disconnected()), this, SLOT(onDisconnected())); connect(m_connection, SIGNAL(disconnected()), this, SLOT(onDisconnected()));
@ -199,8 +198,12 @@ void CloudConnection::onPong(const quint64 elapsedTime, const QByteArray &payloa
void CloudConnection::onPongTimeout() void CloudConnection::onPongTimeout()
{ {
qCWarning(dcCloud()) << "Pong timeout: did not get a ping response from the server (after 5s): reconnecting to the server..."; qCWarning(dcCloud()) << "Pong timeout: did not get a ping response from the server (after 5s): reconnecting to the server...";
disconnectFromCloud(); m_connection->close(QWebSocketProtocol::CloseCodeAbnormalDisconnection, "Ping timeout");
connectToCloud(); if (authenticator()->authenticated()) {
m_connection->open(m_proxyServerUrl);
} else {
m_authenticator->startAuthentication();
}
} }
void CloudConnection::onStateChanged(const QAbstractSocket::SocketState &state) void CloudConnection::onStateChanged(const QAbstractSocket::SocketState &state)

2
tests/auto/auto.pro
View File

@ -17,5 +17,5 @@ SUBDIRS = versioning \
websocketserver \ websocketserver \
logging \ logging \
restlogging \ restlogging \
#coap \ #coap \ # temporary removed until fixed
configurations \ configurations \