Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-07 08:35:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

LibresapiLocalClient improve error handling

Browse source
This commit is contained in:
Gioacchino Mazzurco 2017-04-10 15:00:14 +02:00
parent c3ba5511d8
commit 29a3d105c4
2 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
retroshare-qml-app/src/libresapilocalclient.cpp
View file

@ -22,13 +22,14 @@
#include <QJSEngine>
#include <QtDebug>
void LibresapiLocalClient::openConnection(QString socketPath)
void LibresapiLocalClient::openConnection(const QString& socketPath)
{
connect(& mLocalSocket, SIGNAL(error(QLocalSocket::LocalSocketError)),
this, SLOT(socketError(QLocalSocket::LocalSocketError)));
connect(& mLocalSocket, SIGNAL(readyRead()),
this, SLOT(read()));
mLocalSocket.connectToServer(socketPath);
mSocketPath = socketPath;
socketConnectAttempt();
}
int LibresapiLocalClient::request( const QString& path, const QString& jsonData,
@ -44,13 +45,24 @@ int LibresapiLocalClient::request( const QString& path, const QString& jsonData,
data.append(path); data.append('\n');
data.append(jsonData); data.append('\n');
processingQueue.enqueue(PQRecord(path, jsonData, callback));
return mLocalSocket.write(data);
int ret = mLocalSocket.write(data);
if(ret < 0) socketError(mLocalSocket.error());
return ret;
}
void LibresapiLocalClient::socketError(QLocalSocket::LocalSocketError)
void LibresapiLocalClient::socketError(QLocalSocket::LocalSocketError error)
{
qCritical() << __PRETTY_FUNCTION__ << "Socket Eerror! "
qCritical() << __PRETTY_FUNCTION__ << "Socket error! " << error
<< mLocalSocket.errorString();
if(mLocalSocket.state() == QLocalSocket::UnconnectedState &&
!mConnectAttemptTimer.isActive())
{
qDebug() << __PRETTY_FUNCTION__ << "Socket:" << mSocketPath
<< "is not connected, scheduling a connect attempt again";
mConnectAttemptTimer.start();
}
}
void LibresapiLocalClient::read()