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

Fix blocking I/O while validating config schema (#121263)

Browse Source
This commit is contained in:
J. Nick Koston 2024-07-05 01:58:30 -05:00 committed by GitHub
parent e71f6c5948
commit 5a24ee0bc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/config.py
View File

@ -815,7 +815,9 @@ async def async_process_ha_core_config(hass: HomeAssistant, config: dict) -> Non
This method is a coroutine. This method is a coroutine.
""" """
config = CORE_CONFIG_SCHEMA(config) # CORE_CONFIG_SCHEMA is not async safe since it uses vol.IsDir
# so we need to run it in an executor job.
config = await hass.async_add_executor_job(CORE_CONFIG_SCHEMA, config)
# Only load auth during startup. # Only load auth during startup.
if not hasattr(hass, "auth"): if not hasattr(hass, "auth"):
@ -1529,9 +1531,15 @@ async def async_process_component_config(
return IntegrationConfigInfo(None, config_exceptions) return IntegrationConfigInfo(None, config_exceptions)
# No custom config validator, proceed with schema validation # No custom config validator, proceed with schema validation
if hasattr(component, "CONFIG_SCHEMA"): if config_schema := getattr(component, "CONFIG_SCHEMA", None):
try: try:
return IntegrationConfigInfo(component.CONFIG_SCHEMA(config), []) if domain in config:
# cv.isdir, cv.isfile, cv.isdevice are not async
# friendly so we need to run this in executor
schema = await hass.async_add_executor_job(config_schema, config)
else:
schema = config_schema(config)
return IntegrationConfigInfo(schema, [])
except vol.Invalid as exc: except vol.Invalid as exc:
exc_info = ConfigExceptionInfo( exc_info = ConfigExceptionInfo(
exc, exc,