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

show MQTT disconnects as warnings #543

Browse Source
This commit is contained in:
Proddy
2022-07-20 12:03:47 +02:00
parent 4420ae33b8
commit 66fbd2b359
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/mqtt.cpp
View File

@@ -445,19 +445,17 @@ void Mqtt::start() {
} }
connecting_ = false; connecting_ = false;
if (reason == AsyncMqttClientDisconnectReason::TCP_DISCONNECTED) { if (reason == AsyncMqttClientDisconnectReason::TCP_DISCONNECTED) {
LOG_INFO(F("MQTT disconnected: TCP")); LOG_WARNING(F("MQTT disconnected: TCP"));
} } else if (reason == AsyncMqttClientDisconnectReason::MQTT_IDENTIFIER_REJECTED) {
if (reason == AsyncMqttClientDisconnectReason::MQTT_IDENTIFIER_REJECTED) { LOG_WARNING(F("MQTT disconnected: Identifier Rejected"));
LOG_INFO(F("MQTT disconnected: Identifier Rejected")); } else if (reason == AsyncMqttClientDisconnectReason::MQTT_SERVER_UNAVAILABLE) {
} LOG_WARNING(F("MQTT disconnected: Server unavailable"));
if (reason == AsyncMqttClientDisconnectReason::MQTT_SERVER_UNAVAILABLE) { } else if (reason == AsyncMqttClientDisconnectReason::MQTT_MALFORMED_CREDENTIALS) {
LOG_INFO(F("MQTT disconnected: Server unavailable")); LOG_WARNING(F("MQTT disconnected: Malformed credentials"));
} } else if (reason == AsyncMqttClientDisconnectReason::MQTT_NOT_AUTHORIZED) {
if (reason == AsyncMqttClientDisconnectReason::MQTT_MALFORMED_CREDENTIALS) { LOG_WARNING(F("MQTT disconnected: Not authorized"));
LOG_INFO(F("MQTT disconnected: Malformed credentials")); } else {
} LOG_WARNING(F("MQTT disconnected: code %d"), reason);
if (reason == AsyncMqttClientDisconnectReason::MQTT_NOT_AUTHORIZED) {
LOG_INFO(F("MQTT disconnected: Not authorized"));
} }
}); });
@@ -628,11 +626,11 @@ void Mqtt::ha_status() {
doc["~"] = mqtt_base_; // default ems-esp doc["~"] = mqtt_base_; // default ems-esp
// doc["avty_t"] = FJSON("~/status"); // commented out, as it causes errors in HA sometimes // doc["avty_t"] = FJSON("~/status"); // commented out, as it causes errors in HA sometimes
// doc["json_attr_t"] = FJSON("~/heartbeat"); // store also as HA attributes // doc["json_attr_t"] = FJSON("~/heartbeat"); // store also as HA attributes
doc["stat_t"] = FJSON("~/heartbeat"); doc["stat_t"] = FJSON("~/heartbeat");
doc["object_id"] = FJSON("ems_esp_status"); doc["object_id"] = FJSON("ems_esp_status");
doc["name"] = FJSON("EMS-ESP status"); doc["name"] = FJSON("EMS-ESP status");
doc["ic"] = F_(icondevice); doc["ic"] = F_(icondevice);
doc["val_tpl"] = FJSON("{{value_json['bus_status']}}"); doc["val_tpl"] = FJSON("{{value_json['bus_status']}}");
JsonObject dev = doc.createNestedObject("dev"); JsonObject dev = doc.createNestedObject("dev");
dev["name"] = F_(EMSESP); // "EMS-ESP" dev["name"] = F_(EMSESP); // "EMS-ESP"
@@ -1121,7 +1119,7 @@ void Mqtt::publish_ha_sensor_config(uint8_t type,
// name (friendly name) = <tag> <name> // name (friendly name) = <tag> <name>
short_name[0] = toupper(short_name[0]); // capitalize first letter short_name[0] = toupper(short_name[0]); // capitalize first letter
doc["name"] = short_name; doc["name"] = short_name;
// value template // value template
// if its nested mqtt format then use the appended entity name, otherwise take the original // if its nested mqtt format then use the appended entity name, otherwise take the original