jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-26 14:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only decode msg topic once when handling mqtt payloads (#109258)

Browse Source
This commit is contained in:
J. Nick Koston 2024-01-31 16:42:58 -10:00 committed by GitHub
parent 31094e72a0
commit 5c3bf13ca4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
homeassistant/components/mqtt/client.py
View File

@ -818,25 +818,29 @@ class MQTT:
@callback @callback
def _mqtt_handle_message(self, msg: mqtt.MQTTMessage) -> None: def _mqtt_handle_message(self, msg: mqtt.MQTTMessage) -> None:
topic = msg.topic
# msg.topic is a property that decodes the topic to a string
# every time it is accessed. Save the result to avoid
# decoding the same topic multiple times.
_LOGGER.debug( _LOGGER.debug(
"Received%s message on %s (qos=%s): %s", "Received%s message on %s (qos=%s): %s",
" retained" if msg.retain else "", " retained" if msg.retain else "",
msg.topic, topic,
msg.qos, msg.qos,
msg.payload[0:8192], msg.payload[0:8192],
) )
timestamp = dt_util.utcnow() timestamp = dt_util.utcnow()
subscriptions = self._matching_subscriptions(msg.topic) subscriptions = self._matching_subscriptions(topic)
for subscription in subscriptions: for subscription in subscriptions:
if msg.retain: if msg.retain:
retained_topics = self._retained_topics.setdefault(subscription, set()) retained_topics = self._retained_topics.setdefault(subscription, set())
# Skip if the subscription already received a retained message # Skip if the subscription already received a retained message
if msg.topic in retained_topics: if topic in retained_topics:
continue continue
# Remember the subscription had an initial retained message # Remember the subscription had an initial retained message
self._retained_topics[subscription].add(msg.topic) self._retained_topics[subscription].add(topic)
payload: SubscribePayloadType = msg.payload payload: SubscribePayloadType = msg.payload
if subscription.encoding is not None: if subscription.encoding is not None:
@ -846,7 +850,7 @@ class MQTT:
_LOGGER.warning( _LOGGER.warning(
"Can't decode payload %s on %s with encoding %s (for %s)", "Can't decode payload %s on %s with encoding %s (for %s)",
msg.payload[0:8192], msg.payload[0:8192],
msg.topic, topic,
subscription.encoding, subscription.encoding,
subscription.job, subscription.job,
) )
@ -854,7 +858,7 @@ class MQTT:
self.hass.async_run_hass_job( self.hass.async_run_hass_job(
subscription.job, subscription.job,
ReceiveMessage( ReceiveMessage(
msg.topic, topic,
payload, payload,
msg.qos, msg.qos,
msg.retain, msg.retain,