evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop scripts with eager tasks (#115340)

Browse source
This commit is contained in:
J. Nick Koston 2024-04-10 02:41:13 -10:00 • committed by GitHub
parent a6b93ea8ac
commit f80894d56f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
homeassistant/helpers/script.py
View file

@ -1250,7 +1250,7 @@ async def _async_stop_scripts_after_shutdown(
_LOGGER.warning("Stopping scripts running too long after shutdown: %s", names) _LOGGER.warning("Stopping scripts running too long after shutdown: %s", names)
await asyncio.gather( await asyncio.gather(
*( *(
script["instance"].async_stop(update_state=False) create_eager_task(script["instance"].async_stop(update_state=False))
for script in running_scripts for script in running_scripts
) )
) )
@ -1269,7 +1269,10 @@ async def _async_stop_scripts_at_shutdown(hass: HomeAssistant, event: Event) ->
names = ", ".join([script["instance"].name for script in running_scripts]) names = ", ".join([script["instance"].name for script in running_scripts])
_LOGGER.debug("Stopping scripts running at shutdown: %s", names) _LOGGER.debug("Stopping scripts running at shutdown: %s", names)
await asyncio.gather( await asyncio.gather(
*(script["instance"].async_stop() for script in running_scripts) *(
create_eager_task(script["instance"].async_stop())
for script in running_scripts
)
) )
@ -1695,6 +1698,9 @@ class Script:
# return false after the other script runs were stopped until our task # return false after the other script runs were stopped until our task
# resumes running. # resumes running.
self._log("Restarting") self._log("Restarting")
# Important: yield to the event loop to allow the script to start in case
# the script is restarting itself.
await asyncio.sleep(0)
await self.async_stop(update_state=False, spare=run) await self.async_stop(update_state=False, spare=run)
if started_action: if started_action:
@ -1724,11 +1730,13 @@ class Script:
# asyncio.shield as asyncio.shield yields to the event loop, which would cause # asyncio.shield as asyncio.shield yields to the event loop, which would cause
# us to wait for script runs added after the call to async_stop. # us to wait for script runs added after the call to async_stop.
aws = [ aws = [
asyncio.create_task(run.async_stop()) for run in self._runs if run != spare create_eager_task(run.async_stop()) for run in self._runs if run != spare
] ]
if not aws: if not aws:
return return
await asyncio.shield(self._async_stop(aws, update_state, spare)) await asyncio.shield(
create_eager_task(self._async_stop(aws, update_state, spare))
)
async def _async_get_condition(self, config): async def _async_get_condition(self, config):
if isinstance(config, template.Template): if isinstance(config, template.Template):