From d70aa5f9a9c9e6d93a459d5e3df61862f2ba48a9 Mon Sep 17 00:00:00 2001 From: Mike Degatano Date: Wed, 4 Oct 2023 12:53:10 -0400 Subject: [PATCH] JobGroups check active job to determine if in progress (#4602) --- supervisor/docker/interface.py | 4 +--- supervisor/homeassistant/core.py | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/supervisor/docker/interface.py b/supervisor/docker/interface.py index d31972b09..406935ff5 100644 --- a/supervisor/docker/interface.py +++ b/supervisor/docker/interface.py @@ -1,7 +1,6 @@ """Interface class for Supervisor Docker object.""" from __future__ import annotations -import asyncio from collections import defaultdict from collections.abc import Awaitable from contextlib import suppress @@ -92,7 +91,6 @@ class DockerInterface(JobGroup): ) self.coresys: CoreSys = coresys self._meta: dict[str, Any] | None = None - self.lock: asyncio.Lock = asyncio.Lock() @property def timeout(self) -> int: @@ -153,7 +151,7 @@ class DockerInterface(JobGroup): @property def in_progress(self) -> bool: """Return True if a task is in progress.""" - return self.lock.locked() + return self.active_job @property def restart_policy(self) -> RestartPolicy | None: diff --git a/supervisor/homeassistant/core.py b/supervisor/homeassistant/core.py index 71d9d5342..d337bb5db 100644 --- a/supervisor/homeassistant/core.py +++ b/supervisor/homeassistant/core.py @@ -58,7 +58,6 @@ class HomeAssistantCore(JobGroup): """Initialize Home Assistant object.""" super().__init__(coresys, JOB_GROUP_HOME_ASSISTANT_CORE) self.instance: DockerHomeAssistant = DockerHomeAssistant(coresys) - self.lock: asyncio.Lock = asyncio.Lock() self._error_state: bool = False @property @@ -402,7 +401,7 @@ class HomeAssistantCore(JobGroup): @property def in_progress(self) -> bool: """Return True if a task is in progress.""" - return self.instance.in_progress or self.lock.locked() + return self.instance.in_progress or self.active_job async def check_config(self) -> ConfigResult: """Run Home Assistant config check."""