andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

show mqtt reconnects the same way as network reconnects (count disconnects)

Browse Source
This commit is contained in:
MichaelDvP
2024-11-19 08:19:19 +01:00
parent e52f988261
commit d06ea9590e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
interface/src/app/status/MqttStatus.tsx
View File

@@ -70,9 +70,9 @@ const MqttStatus = () => {
return LL.NOT_ENABLED(); return LL.NOT_ENABLED();
} }
if (connected) { if (connected) {
return LL.CONNECTED(0) + (connect_count > 1 ? ' (' + connect_count + ')' : ''); return LL.CONNECTED(0) + ' (' + connect_count + ')';
} }
return LL.DISCONNECTED() + (connect_count > 1 ? ' (' + connect_count + ')' : ''); return LL.DISCONNECTED() + ' (' + connect_count + ')';
}; };
const disconnectReason = ({ disconnect_reason }: MqttStatusType) => { const disconnectReason = ({ disconnect_reason }: MqttStatusType) => {

2
src/mqtt.cpp
View File

@@ -468,6 +468,7 @@ void Mqtt::on_disconnect(espMqttClientTypes::DisconnectReason reason) {
return; return;
} }
connecting_ = false; connecting_ = false;
connectcount_++; // count # reconnects
if (reason == espMqttClientTypes::DisconnectReason::TCP_DISCONNECTED) { if (reason == espMqttClientTypes::DisconnectReason::TCP_DISCONNECTED) {
LOG_WARNING("MQTT disconnected: TCP"); LOG_WARNING("MQTT disconnected: TCP");
@@ -499,7 +500,6 @@ void Mqtt::on_connect() {
LOG_INFO("MQTT connected"); LOG_INFO("MQTT connected");
connecting_ = true; connecting_ = true;
connectcount_++; // count # reconnects. not currently used.
queuecount_ = mqttClient_->queueSize(); queuecount_ = mqttClient_->queueSize();
load_settings(); // reload MQTT settings - in case they have changes load_settings(); // reload MQTT settings - in case they have changes

8
src/system.cpp
View File

@@ -691,9 +691,9 @@ void System::heartbeat_json(JsonObject output) {
output["txfails"] = EMSESP::txservice_.telegram_read_fail_count() + EMSESP::txservice_.telegram_write_fail_count(); output["txfails"] = EMSESP::txservice_.telegram_read_fail_count() + EMSESP::txservice_.telegram_write_fail_count();
if (Mqtt::enabled()) { if (Mqtt::enabled()) {
output["mqttcount"] = Mqtt::publish_count(); output["mqttcount"] = Mqtt::publish_count();
output["mqttfails"] = Mqtt::publish_fails(); output["mqttfails"] = Mqtt::publish_fails();
output["mqttconnects"] = Mqtt::connect_count(); output["mqttreconnects"] = Mqtt::connect_count();
} }
output["apicalls"] = WebAPIService::api_count(); // + WebAPIService::api_fails(); output["apicalls"] = WebAPIService::api_count(); // + WebAPIService::api_fails();
output["apifails"] = WebAPIService::api_fails(); output["apifails"] = WebAPIService::api_fails();
@@ -1557,7 +1557,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
node["MQTTPublishes"] = Mqtt::publish_count(); node["MQTTPublishes"] = Mqtt::publish_count();
node["MQTTQueued"] = Mqtt::publish_queued(); node["MQTTQueued"] = Mqtt::publish_queued();
node["MQTTPublishFails"] = Mqtt::publish_fails(); node["MQTTPublishFails"] = Mqtt::publish_fails();
node["MQTTConnects"] = Mqtt::connect_count(); node["MQTTReconnects"] = Mqtt::connect_count();
} }
EMSESP::esp8266React.getMqttSettingsService()->read([&](const MqttSettings & settings) { EMSESP::esp8266React.getMqttSettingsService()->read([&](const MqttSettings & settings) {
node["enabled"] = settings.enabled; node["enabled"] = settings.enabled;