jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add additional error handling for automation script run (#45613)

Browse Source
This commit is contained in:
Marc Mueller 2021-01-28 09:26:41 +01:00 committed by GitHub
parent 5711d61b38
commit 7673f57248
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/components/automation/__init__.py
View File

@ -404,6 +404,12 @@ class AutomationEntity(ToggleEntity, RestoreEntity):
await self.action_script.async_run( await self.action_script.async_run(
variables, trigger_context, started_action variables, trigger_context, started_action
) )
except (vol.Invalid, HomeAssistantError) as err:
self._logger.error(
"Error while executing automation %s: %s",
self.entity_id,
err,
)
except Exception: # pylint: disable=broad-except except Exception: # pylint: disable=broad-except
self._logger.exception("While executing automation %s", self.entity_id) self._logger.exception("While executing automation %s", self.entity_id)

3
homeassistant/helpers/script.py
View File

@ -291,6 +291,9 @@ class _ScriptRun:
elif isinstance(exception, exceptions.ServiceNotFound): elif isinstance(exception, exceptions.ServiceNotFound):
error_desc = "Service not found" error_desc = "Service not found"
elif isinstance(exception, exceptions.HomeAssistantError):
error_desc = "Error"
else: else:
error_desc = "Unexpected error" error_desc = "Unexpected error"
level = _LOG_EXCEPTION level = _LOG_EXCEPTION

1
tests/components/automation/test_init.py
View File

@ -947,6 +947,7 @@ async def test_automation_with_error_in_script(hass, caplog):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert "Service not found" in caplog.text assert "Service not found" in caplog.text
assert "Traceback" not in caplog.text
async def test_automation_with_error_in_script_2(hass, caplog): async def test_automation_with_error_in_script_2(hass, caplog):