nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'J0EK3R-master'

Browse Source
This commit is contained in:
john30
2018-01-28 11:04:33 +01:00
parent 3a613f84c6 85f55fc584
commit 58048e0c99
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mqtthandler.cpp
+5 -3
View File
@@ -380,9 +380,8 @@ MqttHandler::MqttHandler(UserInfo* userInfo, BusHandler* busHandler, MessageMap*
#else #else
if (mosquitto_connect(m_mosquitto, g_host, g_port, 60, true) != MOSQ_ERR_SUCCESS) { if (mosquitto_connect(m_mosquitto, g_host, g_port, 60, true) != MOSQ_ERR_SUCCESS) {
#endif #endif
logOtherError("mqtt", "unable to connect"); m_connected = false;
mosquitto_destroy(m_mosquitto); logOtherNotice("mqtt", "unable to connect - retry...");
m_mosquitto = NULL;
} else { } else {
m_connected = true; // assume success until connect_callback says otherwise m_connected = true; // assume success until connect_callback says otherwise
logOtherDebug("mqtt", "connection requested"); logOtherDebug("mqtt", "connection requested");
@@ -588,6 +587,9 @@ void MqttHandler::handleTraffic() {
#else #else
ret = mosquitto_loop(m_mosquitto, -1); ret = mosquitto_loop(m_mosquitto, -1);
#endif #endif
if(ret == MOSQ_ERR_NO_CONN) {
ret = mosquitto_reconnect(m_mosquitto);
}
if (!m_connected && ret == MOSQ_ERR_SUCCESS) { if (!m_connected && ret == MOSQ_ERR_SUCCESS) {
m_connected = true; m_connected = true;
logOtherNotice("mqtt", "connection re-established"); logOtherNotice("mqtt", "connection re-established");