From b15912fe9fc0fb6fef82fdeb38e3d3110a301af2 Mon Sep 17 00:00:00 2001 From: agessaman Date: Sat, 8 Nov 2025 15:04:48 -0800 Subject: [PATCH] Fix remaining conflict marker and add missing RECONNECT_THROTTLE_MS constant --- src/helpers/bridges/MQTTBridge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/bridges/MQTTBridge.cpp b/src/helpers/bridges/MQTTBridge.cpp index a6c1b3ea..86c4b214 100644 --- a/src/helpers/bridges/MQTTBridge.cpp +++ b/src/helpers/bridges/MQTTBridge.cpp @@ -1345,6 +1345,7 @@ void MQTTBridge::maintainAnalyzerConnections() { const unsigned long RENEWAL_BUFFER = 3600; // Renew tokens 1 hour before expiration const unsigned long RENEWAL_THROTTLE_MS = 60000; // Don't attempt renewal more than once per minute + const unsigned long RECONNECT_THROTTLE_MS = 60000; // Don't attempt reconnection more than once per minute unsigned long now_millis = millis(); @@ -1532,7 +1533,6 @@ void MQTTBridge::maintainAnalyzerConnections() { // Note: PsychicMqttClient handles automatic reconnection internally, // but we need to ensure tokens are renewed before reconnection attempts ->>>>>>> 1ebe417c (Enhance CommonCLI and JWTHelper for MQTT owner public key support) } void MQTTBridge::setMessageTypes(bool status, bool packets, bool raw) {