home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-07-29 18:28:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gracefully disconnect MQTT entry if entry is reloaded (#119753)

Browse Source
This commit is contained in:
Jan Bouwhuis
2024-06-18 09:29:22 +02:00
committed by GitHub
parent 67223b2a2d
commit 6eb9d1e01d
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -803,8 +803,12 @@ class MQTT:
await asyncio.sleep(RECONNECT_INTERVAL_SECONDS)
async def async_disconnect(self) -> None:
"""Stop the MQTT client."""
async def async_disconnect(self, disconnect_paho_client: bool = False) -> None:
"""Stop the MQTT client.
We only disconnect grafully if disconnect_paho_client is set, but not
when Home Assistant is shut down.
"""
# stop waiting for any pending subscriptions
await self._subscribe_debouncer.async_cleanup()
@ -824,7 +828,9 @@ class MQTT:
self._should_reconnect = False
self._async_cancel_reconnect()
# We do not gracefully disconnect to ensure
# the broker publishes the will message
# the broker publishes the will message unless the entry is reloaded
if disconnect_paho_client:
self._mqttc.disconnect()
@callback
def async_restore_tracked_subscriptions(
@ -1274,7 +1280,8 @@ class MQTT:
self._async_connection_result(False)
self.connected = False
async_dispatcher_send(self.hass, MQTT_CONNECTION_STATE, False)
_LOGGER.warning(
_LOGGER.log(
logging.INFO if result_code == 0 else logging.DEBUG,
"Disconnected from MQTT server %s:%s (%s)",
self.conf[CONF_BROKER],
self.conf.get(CONF_PORT, DEFAULT_PORT),