jessequ
/
qamqp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added GIT_VERSION.

This commit is contained in:
De Stefano 2016-10-03 22:44:49 +02:00
parent a4d32efefb
commit 275c5dce33
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qamqpclient.cpp
View File

@ -162,7 +162,10 @@ void QAmqpClientPrivate::_q_disconnect()
// private slots // private slots
void QAmqpClientPrivate::_q_socketConnected() void QAmqpClientPrivate::_q_socketConnected()
{ {
if(reconnectFixedTimeout == false)
{
timeout = 0; timeout = 0;
}
char header[8] = {'A', 'M', 'Q', 'P', 0, 0, 9, 1}; char header[8] = {'A', 'M', 'Q', 'P', 0, 0, 9, 1};
socket->write(header, 8); socket->write(header, 8);
} }
@ -887,6 +890,11 @@ void QAmqpClient::setSslConfiguration(const QSslConfiguration &config)
} }
} }
QString QAmqpClient::getGitVersion()
{
return QString(GIT_VERSION);
}
void QAmqpClient::ignoreSslErrors(const QList<QSslError> &errors) void QAmqpClient::ignoreSslErrors(const QList<QSslError> &errors)
{ {
Q_D(QAmqpClient); Q_D(QAmqpClient);

2
src/qamqpclient.h
View File

@ -95,6 +95,8 @@ public:
QSslConfiguration sslConfiguration() const; QSslConfiguration sslConfiguration() const;
void setSslConfiguration(const QSslConfiguration &config); void setSslConfiguration(const QSslConfiguration &config);
static QString getGitVersion();
// channels // channels
QAmqpExchange *createExchange(int channelNumber = -1); QAmqpExchange *createExchange(int channelNumber = -1);
QAmqpExchange *createExchange(const QString &name, int channelNumber = -1); QAmqpExchange *createExchange(const QString &name, int channelNumber = -1);

7
src/src.pro
View File

@ -31,6 +31,13 @@ greaterThan(NEED_GCOV_SUPPORT, 0) {
} }
} }
#Define GIT Macros
GIT_VERSION = $$system(git describe --long --dirty)
DEFINES += GIT_VERSION=\\\"$$GIT_VERSION\\\"
GIT_TAG = $$system(git describe --abbrev=0)
VERSION = $$replace(GIT_TAG, v,)
PRIVATE_HEADERS += \ PRIVATE_HEADERS += \
qamqpchannel_p.h \ qamqpchannel_p.h \
qamqpchannelhash_p.h \ qamqpchannelhash_p.h \

3
tests/auto/qamqpclient/tst_qamqpclient.cpp
View File

@ -160,6 +160,9 @@ void tst_QAMQPClient::autoReconnectTimeout()
QVERIFY(waitForSignal(&client, SIGNAL(connected()), 60)); QVERIFY(waitForSignal(&client, SIGNAL(connected()), 60));
qDebug() <<"connected" ; qDebug() <<"connected" ;
QVERIFY(waitForSignal(&client, SIGNAL(disconnected()), 60));
QProcess::execute("rabbitmqctl", QStringList() << "start_app");
QVERIFY(waitForSignal(&client, SIGNAL(connected()), 60));
} }
void tst_QAMQPClient::tune() void tst_QAMQPClient::tune()