From 3ebcee9bbb3eff7e7c7b6df3288035b56b0b113b Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 26 May 2024 21:56:09 -1000 Subject: [PATCH] Fix mqtt chunk subscribe logging (#118217) --- homeassistant/components/mqtt/client.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/mqtt/client.py b/homeassistant/components/mqtt/client.py index 618389ba121..b219e73975e 100644 --- a/homeassistant/components/mqtt/client.py +++ b/homeassistant/components/mqtt/client.py @@ -952,13 +952,14 @@ class MQTT: debug_enabled = _LOGGER.isEnabledFor(logging.DEBUG) for chunk in chunked_or_all(subscription_list, MAX_SUBSCRIBES_PER_CALL): - result, mid = self._mqttc.subscribe(chunk) + chunk_list = list(chunk) + + result, mid = self._mqttc.subscribe(chunk_list) if debug_enabled: - for topic, qos in subscriptions.items(): - _LOGGER.debug( - "Subscribing to %s, mid: %s, qos: %s", topic, mid, qos - ) + _LOGGER.debug( + "Subscribing with mid: %s to topics with qos: %s", mid, chunk_list + ) self._last_subscribe = time.monotonic() await self._async_wait_for_mid_or_raise(mid, result) @@ -973,10 +974,13 @@ class MQTT: debug_enabled = _LOGGER.isEnabledFor(logging.DEBUG) for chunk in chunked_or_all(topics, MAX_UNSUBSCRIBES_PER_CALL): - result, mid = self._mqttc.unsubscribe(chunk) + chunk_list = list(chunk) + + result, mid = self._mqttc.unsubscribe(chunk_list) if debug_enabled: - for topic in chunk: - _LOGGER.debug("Unsubscribing from %s, mid: %s", topic, mid) + _LOGGER.debug( + "Unsubscribing with mid: %s to topics: %s", mid, chunk_list + ) await self._async_wait_for_mid_or_raise(mid, result)