frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

make protoconnection to invalid host less blocking

Browse Source 
Former-commit-id: e7a89c87b15fbe9809ec63468b59ecc55c6d3e72
This commit is contained in:
redpanther 2016-02-25 15:21:25 +01:00
parent 878538eb50
commit ea89a85ddb
2 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/protoserver/ProtoConnection.h
View File

@ -7,6 +7,7 @@
#include <QColor> #include <QColor>
#include <QImage> #include <QImage>
#include <QTcpSocket> #include <QTcpSocket>
#include <QTimer>
#include <QMap> #include <QMap>
// hyperion util // hyperion util
@ -19,8 +20,11 @@
/// ///
/// Connection class to setup an connection to the hyperion server and execute commands /// Connection class to setup an connection to the hyperion server and execute commands
/// ///
class ProtoConnection class ProtoConnection : public QObject
{ {
Q_OBJECT
public: public:
/// ///
/// Constructor /// Constructor
@ -74,10 +78,13 @@ public:
/// ///
void sendMessage(const proto::HyperionRequest & message); void sendMessage(const proto::HyperionRequest & message);
private: private slots:
/// Try to connect to the Hyperion host /// Try to connect to the Hyperion host
void connectToHost(); void connectToHost();
private:
/// ///
/// Parse a reply message /// Parse a reply message
/// ///
@ -99,4 +106,7 @@ private:
/// Skip receiving reply messages from Hyperion if set /// Skip receiving reply messages from Hyperion if set
bool _skipReply; bool _skipReply;
QTimer _timer;
QAbstractSocket::SocketState _prevSocketState;
}; };

40
libsrc/protoserver/ProtoConnection.cpp
View File

@ -9,7 +9,8 @@
ProtoConnection::ProtoConnection(const std::string & a) : ProtoConnection::ProtoConnection(const std::string & a) :
_socket(), _socket(),
_skipReply(false) _skipReply(false),
_prevSocketState(QAbstractSocket::UnconnectedState)
{ {
QString address(a.c_str()); QString address(a.c_str());
QStringList parts = address.split(":"); QStringList parts = address.split(":");
@ -29,10 +30,18 @@ ProtoConnection::ProtoConnection(const std::string & a) :
// try to connect to host // try to connect to host
std::cout << "Connecting to Hyperion: " << _host.toStdString() << ":" << _port << std::endl; std::cout << "Connecting to Hyperion: " << _host.toStdString() << ":" << _port << std::endl;
connectToHost(); connectToHost();
// start the connection timer
_timer.setInterval(5000);
_timer.setSingleShot(false);
connect(&_timer,SIGNAL(timeout()), this, SLOT(connectToHost()) );
_timer.start();
} }
ProtoConnection::~ProtoConnection() ProtoConnection::~ProtoConnection()
{ {
_timer.stop();
_socket.close(); _socket.close();
} }
@ -91,20 +100,37 @@ void ProtoConnection::clearAll()
void ProtoConnection::connectToHost() void ProtoConnection::connectToHost()
{ {
_socket.connectToHost(_host, _port); // try connection only when
if (_socket.waitForConnected()) { if (_socket.state() == QAbstractSocket::UnconnectedState)
std::cout << "Connected to Hyperion host" << std::endl; {
_socket.connectToHost(_host, _port);
//_socket.waitForConnected(1000);
} }
} }
void ProtoConnection::sendMessage(const proto::HyperionRequest &message) void ProtoConnection::sendMessage(const proto::HyperionRequest &message)
{ {
if (_socket.state() == QAbstractSocket::UnconnectedState) // print out connection message only when state is changed
if (_socket.state() != _prevSocketState )
{ {
std::cout << "Currently disconnected: trying to connect to host" << std::endl; switch (_socket.state() )
connectToHost(); {
case QAbstractSocket::UnconnectedState:
std::cout << "No connection to Hyperion: " << _host.toStdString() << ":" << _port << std::endl;
break;
case QAbstractSocket::ConnectedState:
std::cout << "Connected to Hyperion: " << _host.toStdString() << ":" << _port << std::endl;
break;
default:
//std::cout << "Connecting to Hyperion: " << _host.toStdString() << ":" << _port << std::endl;
break;
}
_prevSocketState = _socket.state();
} }
if (_socket.state() != QAbstractSocket::ConnectedState) if (_socket.state() != QAbstractSocket::ConnectedState)
{ {
return; return;