iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Mqtt Reserve

Browse Source
This commit is contained in:
Yuri Trikoz
2020-12-18 13:43:13 +03:00
parent 5f9d9ec48e
commit eddb2eb289
1 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/MqttClient.cpp
View File

@@ -6,8 +6,25 @@
#include "Global.h" #include "Global.h"
#include "Init.h" #include "Init.h"
enum MqttBroker {MQTT_PRIMARY, MQTT_RESERVE};
MqttBroker activeBroker = MQTT_PRIMARY;
String mqttPrefix; String mqttPrefix;
String mqttRootDevice; String mqttRootDevice;
String mqttPass;
String mqttServer;
String mqttUser;
uint16_t mqttPort{0};
uint16_t reconnectionCounter{0};
bool primaryExist = false;
const String getParamName(const char* param, MqttBroker broker) {
return String("mqtt") + param + (broker == MQTT_RESERVE? "2": "");
}
bool checkBrokerParams(MqttBroker broker) {
return !jsonReadStr(configSetupJson, getParamName("Server", broker)).isEmpty();
}
void mqttInit() { void mqttInit() {
myNotAsyncActions->add( myNotAsyncActions->add(
@@ -29,6 +46,16 @@ void mqttInit() {
} }
else { else {
SerialPrint("E", "MQTT", "lost connection"); SerialPrint("E", "MQTT", "lost connection");
if (reconnectionCounter++ > 5) {
if (activeBroker == MQTT_PRIMARY) {
if (checkBrokerParams(MQTT_RESERVE)) {
activeBroker = MQTT_RESERVE;
}
} else {
activeBroker = MQTT_PRIMARY;
}
reconnectionCounter = 0;
}
mqttConnect(); mqttConnect();
} }
} }
@@ -77,25 +104,35 @@ void mqttSubscribe() {
} }
} }
boolean mqttConnect() { bool readBrokerParams(MqttBroker broker) {
SerialPrint("I", "MQTT", "start connection"); if(!checkBrokerParams(broker)) {
String addr = jsonReadStr(configSetupJson, "mqttServer");
if (!addr) {
SerialPrint("E", "MQTT", "no broker address");
return false; return false;
} }
int port = jsonReadInt(configSetupJson, "mqttPort"); mqttServer = jsonReadStr(configSetupJson, getParamName("Server", broker));
String user = jsonReadStr(configSetupJson, "mqttUser"); mqttPort = jsonReadInt(configSetupJson, getParamName("Port", broker));
String pass = jsonReadStr(configSetupJson, "mqttPass"); mqttUser = jsonReadStr(configSetupJson, getParamName("User", broker));
mqttPass = jsonReadStr(configSetupJson, getParamName("Pass", broker));
return true;
}
boolean mqttConnect() {
SerialPrint("I", "MQTT", String("use ") + (activeBroker == MQTT_PRIMARY? "primary": "reserve"));
if (!checkBrokerParams(activeBroker)) {
SerialPrint("E", "MQTT", "empty broker address");
return false;
}
readBrokerParams(activeBroker);
SerialPrint("I", "MQTT", "start connection");
mqttPrefix = jsonReadStr(configSetupJson, "mqttPrefix"); mqttPrefix = jsonReadStr(configSetupJson, "mqttPrefix");
mqttRootDevice = mqttPrefix + "/" + chipId; mqttRootDevice = mqttPrefix + "/" + chipId;
SerialPrint("I", "MQTT", "broker " + addr + ":" + String(port, DEC)); SerialPrint("I", "MQTT", "broker " + mqttServer + ":" + String(mqttPort, DEC));
SerialPrint("I", "MQTT", "topic " + mqttRootDevice); SerialPrint("I", "MQTT", "topic " + mqttRootDevice);
setLedStatus(LED_FAST); setLedStatus(LED_FAST);
mqtt.setServer(addr.c_str(), port); mqtt.setServer(mqttServer.c_str(), mqttPort);
bool res = false; bool res = false;
if (!mqtt.connected()) { if (!mqtt.connected()) {
if (mqtt.connect(chipId.c_str(), user.c_str(), pass.c_str())) { if (mqtt.connect(chipId.c_str(), mqttUser.c_str(), mqttPass.c_str())) {
SerialPrint("I", "MQTT", "connected"); SerialPrint("I", "MQTT", "connected");
setLedStatus(LED_OFF); setLedStatus(LED_OFF);
mqttSubscribe(); mqttSubscribe();