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

better readability

Browse Source
This commit is contained in:
john30
2017-01-15 13:13:17 +01:00
parent 5b66b4fe3c
commit 8fafded304
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mqtthandler.cpp
+17 -14
View File
@@ -196,11 +196,11 @@ MqttHandler::MqttHandler(BusHandler* busHandler, MessageMap* messages)
} else { } else {
string clientId = PACKAGE_STRING; string clientId = PACKAGE_STRING;
clientId += " "+static_cast<unsigned>(getpid()); clientId += " "+static_cast<unsigned>(getpid());
m_mosquitto = mosquitto_new(clientId.c_str(),
#if (LIBMOSQUITTO_MAJOR >= 1) #if (LIBMOSQUITTO_MAJOR >= 1)
true, m_mosquitto = mosquitto_new(clientId.c_str(), true, this);
#else
m_mosquitto = mosquitto_new(clientId.c_str(), this);
#endif #endif
this);
if (!m_mosquitto) { if (!m_mosquitto) {
logOtherError("mqtt", "unable to instantiate"); logOtherError("mqtt", "unable to instantiate");
} }
@@ -211,16 +211,19 @@ MqttHandler::MqttHandler(BusHandler* busHandler, MessageMap* messages)
string willTopic = m_globalTopic+"running"; string willTopic = m_globalTopic+"running";
string willData = "false"; string willData = "false";
size_t len = willData.length(); size_t len = willData.length();
mosquitto_will_set(m_mosquitto, #if (LIBMOSQUITTO_MAJOR >= 1)
#if (LIBMOSQUITTO_MAJOR < 1) mosquitto_will_set(m_mosquitto, willTopic.c_str(), (uint32_t)len,
true, reinterpret_cast<const uint8_t*>(willData.c_str()), 0, true);
#else
mosquitto_will_set(m_mosquitto, true, willTopic.c_str(), (uint32_t)len,
reinterpret_cast<const uint8_t*>(willData.c_str()), 0, true);
#endif #endif
willTopic.c_str(), (uint32_t)len, reinterpret_cast<const uint8_t*>(willData.c_str()), 0, true);
if (mosquitto_connect(m_mosquitto, g_host, g_port, 60 #if (LIBMOSQUITTO_MAJOR >= 1)
#if (LIBMOSQUITTO_MAJOR < 1) if (mosquitto_connect(m_mosquitto, g_host, g_port, 60) != MOSQ_ERR_SUCCESS) {
, true #else
if (mosquitto_connect(m_mosquitto, g_host, g_port, 60, true) != MOSQ_ERR_SUCCESS) {
#endif #endif
) != MOSQ_ERR_SUCCESS) {
logOtherError("mqtt", "unable to connect"); logOtherError("mqtt", "unable to connect");
mosquitto_destroy(m_mosquitto); mosquitto_destroy(m_mosquitto);
m_mosquitto = NULL; m_mosquitto = NULL;
@@ -408,11 +411,11 @@ void MqttHandler::run() {
void MqttHandler::handleTraffic() { void MqttHandler::handleTraffic() {
if (m_mosquitto) { if (m_mosquitto) {
mosquitto_loop(m_mosquitto, -1
#if (LIBMOSQUITTO_MAJOR >= 1) #if (LIBMOSQUITTO_MAJOR >= 1)
, 1 mosquitto_loop(m_mosquitto, -1, 1);
#else
mosquitto_loop(m_mosquitto, -1);
#endif #endif
);
} }
} }