diff --git a/interface/src/app/status/MqttStatus.tsx b/interface/src/app/status/MqttStatus.tsx index 8f7207c1b..d2808b3b6 100644 --- a/interface/src/app/status/MqttStatus.tsx +++ b/interface/src/app/status/MqttStatus.tsx @@ -70,9 +70,9 @@ const MqttStatus = () => { return LL.NOT_ENABLED(); } 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) => { diff --git a/src/mqtt.cpp b/src/mqtt.cpp index edf5981b4..af2d954fb 100644 --- a/src/mqtt.cpp +++ b/src/mqtt.cpp @@ -468,6 +468,7 @@ void Mqtt::on_disconnect(espMqttClientTypes::DisconnectReason reason) { return; } connecting_ = false; + connectcount_++; // count # reconnects if (reason == espMqttClientTypes::DisconnectReason::TCP_DISCONNECTED) { LOG_WARNING("MQTT disconnected: TCP"); @@ -499,7 +500,6 @@ void Mqtt::on_connect() { LOG_INFO("MQTT connected"); connecting_ = true; - connectcount_++; // count # reconnects. not currently used. queuecount_ = mqttClient_->queueSize(); load_settings(); // reload MQTT settings - in case they have changes diff --git a/src/system.cpp b/src/system.cpp index 27df27e30..96565589e 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -691,9 +691,9 @@ void System::heartbeat_json(JsonObject output) { output["txfails"] = EMSESP::txservice_.telegram_read_fail_count() + EMSESP::txservice_.telegram_write_fail_count(); if (Mqtt::enabled()) { - output["mqttcount"] = Mqtt::publish_count(); - output["mqttfails"] = Mqtt::publish_fails(); - output["mqttconnects"] = Mqtt::connect_count(); + output["mqttcount"] = Mqtt::publish_count(); + output["mqttfails"] = Mqtt::publish_fails(); + output["mqttreconnects"] = Mqtt::connect_count(); } output["apicalls"] = WebAPIService::api_count(); // + 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["MQTTQueued"] = Mqtt::publish_queued(); node["MQTTPublishFails"] = Mqtt::publish_fails(); - node["MQTTConnects"] = Mqtt::connect_count(); + node["MQTTReconnects"] = Mqtt::connect_count(); } EMSESP::esp8266React.getMqttSettingsService()->read([&](const MqttSettings & settings) { node["enabled"] = settings.enabled;