Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 21:34:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show Stats 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 <QJSEngine>
#include <QtDebug> #include <QtDebug>
void LibresapiLocalClient::openConnection(QString socketPath) void LibresapiLocalClient::openConnection(const QString& socketPath)
{ {
connect(& mLocalSocket, SIGNAL(error(QLocalSocket::LocalSocketError)), connect(& mLocalSocket, SIGNAL(error(QLocalSocket::LocalSocketError)),
this, SLOT(socketError(QLocalSocket::LocalSocketError))); this, SLOT(socketError(QLocalSocket::LocalSocketError)));
connect(& mLocalSocket, SIGNAL(readyRead()), connect(& mLocalSocket, SIGNAL(readyRead()),
this, SLOT(read())); this, SLOT(read()));
mLocalSocket.connectToServer(socketPath); mSocketPath = socketPath;
socketConnectAttempt();
} }
int LibresapiLocalClient::request( const QString& path, const QString& jsonData, 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(path); data.append('\n');
data.append(jsonData); data.append('\n'); data.append(jsonData); data.append('\n');
processingQueue.enqueue(PQRecord(path, jsonData, callback)); 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(); << 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() void LibresapiLocalClient::read()

14
retroshare-qml-app/src/libresapilocalclient.h
View File

@ -23,6 +23,7 @@
#include <QLocalSocket> #include <QLocalSocket>
#include <QQueue> #include <QQueue>
#include <QJSValue> #include <QJSValue>
#include <QTimer>
class LibresapiLocalClient : public QObject class LibresapiLocalClient : public QObject
{ {
@ -33,11 +34,17 @@ public:
#ifdef QT_DEBUG #ifdef QT_DEBUG
reqCount(0), ansCount(0), mDebug(true), reqCount(0), ansCount(0), mDebug(true),
#endif // QT_DEBUG #endif // QT_DEBUG
mLocalSocket(this) {} mLocalSocket(this)
{
mConnectAttemptTimer.setSingleShot(true);
mConnectAttemptTimer.setInterval(500);
connect(&mConnectAttemptTimer, SIGNAL(timeout()),
this, SLOT(socketConnectAttempt()));
}
Q_INVOKABLE int request( const QString& path, const QString& jsonData = "", Q_INVOKABLE int request( const QString& path, const QString& jsonData = "",
QJSValue callback = QJSValue::NullValue ); QJSValue callback = QJSValue::NullValue );
Q_INVOKABLE void openConnection(QString socketPath); Q_INVOKABLE void openConnection(const QString& socketPath);
#ifdef QT_DEBUG #ifdef QT_DEBUG
Q_PROPERTY(bool debug READ debug WRITE setDebug NOTIFY debugChanged) Q_PROPERTY(bool debug READ debug WRITE setDebug NOTIFY debugChanged)
@ -51,6 +58,8 @@ public:
#endif // QT_DEBUG #endif // QT_DEBUG
private: private:
QTimer mConnectAttemptTimer;
QString mSocketPath;
QLocalSocket mLocalSocket; QLocalSocket mLocalSocket;
struct PQRecord struct PQRecord
@ -68,6 +77,7 @@ private:
QQueue<PQRecord> processingQueue; QQueue<PQRecord> processingQueue;
private slots: private slots:
void socketConnectAttempt() { mLocalSocket.connectToServer(mSocketPath); }
void socketError(QLocalSocket::LocalSocketError error); void socketError(QLocalSocket::LocalSocketError error);
void read(); void read();