jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-16 13:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust add-on state (#1975)

Browse Source 
* Adjust add-on state

* schedule refresh addon
This commit is contained in:
Pascal Vizeli 2020-08-26 22:52:41 +02:00 committed by GitHub
parent efcfc1f841
commit 6e38216abd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 53 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
supervisor/misc/tasks.py
View File

@ -30,15 +30,17 @@ RUN_RELOAD_UPDATER = 7200
RUN_RELOAD_INGRESS = 930 RUN_RELOAD_INGRESS = 930
RUN_WATCHDOG_HOMEASSISTANT_DOCKER = 15 RUN_WATCHDOG_HOMEASSISTANT_DOCKER = 15
RUN_WATCHDOG_HOMEASSISTANT_API = 300 RUN_WATCHDOG_HOMEASSISTANT_API = 120
RUN_WATCHDOG_DNS_DOCKER = 20 RUN_WATCHDOG_DNS_DOCKER = 30
RUN_WATCHDOG_AUDIO_DOCKER = 30 RUN_WATCHDOG_AUDIO_DOCKER = 60
RUN_WATCHDOG_CLI_DOCKER = 40 RUN_WATCHDOG_CLI_DOCKER = 60
RUN_WATCHDOG_MULTICAST_DOCKER = 50 RUN_WATCHDOG_MULTICAST_DOCKER = 60
RUN_WATCHDOG_ADDON_DOCKER = 30 RUN_WATCHDOG_ADDON_DOCKER = 30
RUN_WATCHDOG_ADDON_APPLICATON = 90 RUN_WATCHDOG_ADDON_APPLICATON = 120
RUN_REFRESH_ADDON = 15
class Tasks(CoreSysAttributes): class Tasks(CoreSysAttributes):
@ -47,100 +49,56 @@ class Tasks(CoreSysAttributes):
def __init__(self, coresys): def __init__(self, coresys):
"""Initialize Tasks.""" """Initialize Tasks."""
self.coresys = coresys self.coresys = coresys
self.jobs = set()
self._cache = {} self._cache = {}
async def load(self): async def load(self):
"""Add Tasks to scheduler.""" """Add Tasks to scheduler."""
# Update # Update
self.jobs.add( self.sys_scheduler.register_task(self._update_addons, RUN_UPDATE_ADDONS)
self.sys_scheduler.register_task(self._update_addons, RUN_UPDATE_ADDONS) self.sys_scheduler.register_task(self._update_supervisor, RUN_UPDATE_SUPERVISOR)
) self.sys_scheduler.register_task(self._update_cli, RUN_UPDATE_CLI)
self.jobs.add( self.sys_scheduler.register_task(self._update_dns, RUN_UPDATE_DNS)
self.sys_scheduler.register_task( self.sys_scheduler.register_task(self._update_audio, RUN_UPDATE_AUDIO)
self._update_supervisor, RUN_UPDATE_SUPERVISOR self.sys_scheduler.register_task(self._update_multicast, RUN_UPDATE_MULTICAST)
)
)
self.jobs.add(
self.sys_scheduler.register_task(self._update_cli, RUN_UPDATE_CLI)
)
self.jobs.add(
self.sys_scheduler.register_task(self._update_dns, RUN_UPDATE_DNS)
)
self.jobs.add(
self.sys_scheduler.register_task(self._update_audio, RUN_UPDATE_AUDIO)
)
self.jobs.add(
self.sys_scheduler.register_task(
self._update_multicast, RUN_UPDATE_MULTICAST
)
)
# Reload # Reload
self.jobs.add( self.sys_scheduler.register_task(self.sys_store.reload, RUN_RELOAD_ADDONS)
self.sys_scheduler.register_task(self.sys_store.reload, RUN_RELOAD_ADDONS) self.sys_scheduler.register_task(self.sys_updater.reload, RUN_RELOAD_UPDATER)
) self.sys_scheduler.register_task(
self.jobs.add( self.sys_snapshots.reload, RUN_RELOAD_SNAPSHOTS
self.sys_scheduler.register_task(
self.sys_updater.reload, RUN_RELOAD_UPDATER
)
)
self.jobs.add(
self.sys_scheduler.register_task(
self.sys_snapshots.reload, RUN_RELOAD_SNAPSHOTS
)
)
self.jobs.add(
self.sys_scheduler.register_task(self.sys_host.reload, RUN_RELOAD_HOST)
)
self.jobs.add(
self.sys_scheduler.register_task(
self.sys_ingress.reload, RUN_RELOAD_INGRESS
)
) )
self.sys_scheduler.register_task(self.sys_host.reload, RUN_RELOAD_HOST)
self.sys_scheduler.register_task(self.sys_ingress.reload, RUN_RELOAD_INGRESS)
# Watchdog # Watchdog
self.jobs.add( self.sys_scheduler.register_task(
self.sys_scheduler.register_task( self._watchdog_homeassistant_docker, RUN_WATCHDOG_HOMEASSISTANT_DOCKER
self._watchdog_homeassistant_docker, RUN_WATCHDOG_HOMEASSISTANT_DOCKER
)
) )
self.jobs.add( self.sys_scheduler.register_task(
self.sys_scheduler.register_task( self._watchdog_homeassistant_api, RUN_WATCHDOG_HOMEASSISTANT_API
self._watchdog_homeassistant_api, RUN_WATCHDOG_HOMEASSISTANT_API
)
) )
self.jobs.add( self.sys_scheduler.register_task(
self.sys_scheduler.register_task( self._watchdog_dns_docker, RUN_WATCHDOG_DNS_DOCKER
self._watchdog_dns_docker, RUN_WATCHDOG_DNS_DOCKER
)
) )
self.jobs.add( self.sys_scheduler.register_task(
self.sys_scheduler.register_task( self._watchdog_audio_docker, RUN_WATCHDOG_AUDIO_DOCKER
self._watchdog_audio_docker, RUN_WATCHDOG_AUDIO_DOCKER
)
) )
self.jobs.add( self.sys_scheduler.register_task(
self.sys_scheduler.register_task( self._watchdog_cli_docker, RUN_WATCHDOG_CLI_DOCKER
self._watchdog_cli_docker, RUN_WATCHDOG_CLI_DOCKER
)
) )
self.jobs.add( self.sys_scheduler.register_task(
self.sys_scheduler.register_task( self._watchdog_multicast_docker, RUN_WATCHDOG_MULTICAST_DOCKER
self._watchdog_multicast_docker, RUN_WATCHDOG_MULTICAST_DOCKER
)
) )
self.jobs.add( self.sys_scheduler.register_task(
self.sys_scheduler.register_task( self._watchdog_addon_docker, RUN_WATCHDOG_ADDON_DOCKER
self._watchdog_addon_docker, RUN_WATCHDOG_ADDON_DOCKER
)
) )
self.jobs.add( self.sys_scheduler.register_task(
self.sys_scheduler.register_task( self._watchdog_addon_application, RUN_WATCHDOG_ADDON_APPLICATON
self._watchdog_addon_application, RUN_WATCHDOG_ADDON_APPLICATON
)
) )
# Refresh
self.sys_scheduler.register_task(self._refresh_addon, RUN_REFRESH_ADDON)
_LOGGER.info("All core tasks are scheduled") _LOGGER.info("All core tasks are scheduled")
async def _update_addons(self): async def _update_addons(self):
@ -384,3 +342,17 @@ class Tasks(CoreSysAttributes):
self.sys_capture_exception(err) self.sys_capture_exception(err)
finally: finally:
self._cache[addon.slug] = 0 self._cache[addon.slug] = 0
async def _refresh_addon(self) -> None:
"""Refresh addon state."""
for addon in self.sys_addons.installed:
# if watchdog need looking for
if addon.watchdog or addon.state != AddonState.STARTED:
continue
# if Addon have running actions
if addon.in_progress or await addon.is_running():
continue
# Adjust state
addon.state = AddonState.STOPPED