Fix lingering timer in duckdns (home-assistant#92516)

plugwise · May 5, 2023 · 7d6102d · 7d6102d
1 parent 603d909
commit 7d6102d
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/homeassistant/components/duckdns/__init__.py b/homeassistant/components/duckdns/__init__.py
@@ -7,7 +7,13 @@
 import voluptuous as vol
 
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_DOMAIN
-from homeassistant.core import CALLBACK_TYPE, HomeAssistant, ServiceCall, callback
+from homeassistant.core import (
+    CALLBACK_TYPE,
+    HassJob,
+    HomeAssistant,
+    ServiceCall,
+    callback,
+)
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_call_later
@@ -110,7 +116,7 @@ def async_track_time_interval_backoff(
     """Add a listener that fires repetitively at every timedelta interval."""
     if not isinstance(intervals, (list, tuple)):
         intervals = (intervals,)
-    remove = None
+    remove: CALLBACK_TYPE | None = None
     failed = 0
 
     async def interval_listener(now: datetime) -> None:
@@ -122,8 +128,11 @@ async def interval_listener(now: datetime) -> None:
                 failed = 0
         finally:
             delay = intervals[failed] if failed < len(intervals) else intervals[-1]
-            remove = async_call_later(hass, delay.total_seconds(), interval_listener)
+            remove = async_call_later(
+                hass, delay.total_seconds(), interval_listener_job
+            )
 
+    interval_listener_job = HassJob(interval_listener, cancel_on_shutdown=True)
     hass.async_run_job(interval_listener, dt_util.utcnow())
 
     def remove_listener() -> None: