adam/pyMC_Repeater
1
0
Fork 0
mirror of https://github.com/pyMC-dev/pyMC_Repeater.git synced 2026-08-06 17:03:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: reorder MQTT error handling.

Browse Source
This commit is contained in:
Lloyd
2026-04-22 14:02:42 +01:00
parent 1626b3f307
commit 852939b701
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repeater/data_acquisition/mqtt_handler.py
+12 -12
View File
@@ -847,18 +847,6 @@ def get_mqtt_error_message(rc: int, is_disconnect: bool = False) -> str:
Returns:
Human-readable error message
"""
if HAS_REASON_CODES:
try:
# ReasonCode object has getName() method and value property
reason = ReasonCode(mqtt.CONNACK if not is_disconnect else mqtt.DISCONNECT, identifier=rc)
name = reason.getName() if hasattr(reason, 'getName') else str(reason)
return f"{name} (code {rc})"
except Exception as e:
# Only log if the manual fallback also won't recognise this code
_fallback = (disconnect_errors if is_disconnect else connect_errors).get(rc)
if _fallback is None:
logger.debug(f"Could not decode reason code {rc}: {e}")
# Fallback to manual mappings - Extended with MQTT v5 codes
connect_errors = {
0: "Connection accepted",
@@ -932,5 +920,17 @@ def get_mqtt_error_message(rc: int, is_disconnect: bool = False) -> str:
162: "Wildcard subscriptions not supported",
}
if HAS_REASON_CODES:
try:
reason = ReasonCode(mqtt.CONNACK if not is_disconnect else mqtt.DISCONNECT, identifier=rc)
name = reason.getName() if hasattr(reason, 'getName') else str(reason)
return f"{name} (code {rc})"
except Exception as e:
_fallback = (disconnect_errors if is_disconnect else connect_errors).get(rc)
if _fallback is None:
logger.debug(f"Could not decode reason code {rc}: {e}")
error_dict = disconnect_errors if is_disconnect else connect_errors
return error_dict.get(rc, f"Unknown error code {rc}")