From 75dffee312c0b0ed93f6312d2005efbccc45bdc7 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 6 Jun 2021 23:49:37 -1000 Subject: [PATCH] Increase isy setup timeout to 60s (#51559) - Ensure errors are displayed in the UI --- homeassistant/components/isy994/__init__.py | 25 +++++++++------------ 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/homeassistant/components/isy994/__init__.py b/homeassistant/components/isy994/__init__.py index 99905e4d946..51c34aeb0a7 100644 --- a/homeassistant/components/isy994/__init__.py +++ b/homeassistant/components/isy994/__init__.py @@ -172,14 +172,12 @@ async def async_setup_entry( ) try: - async with async_timeout.timeout(30): + async with async_timeout.timeout(60): await isy.initialize() except asyncio.TimeoutError as err: - _LOGGER.error( - "Timed out initializing the ISY; device may be busy, trying again later: %s", - err, - ) - raise ConfigEntryNotReady from err + raise ConfigEntryNotReady( + f"Timed out initializing the ISY; device may be busy, trying again later: {err}" + ) from err except ISYInvalidAuthError as err: _LOGGER.error( "Invalid credentials for the ISY, please adjust settings and try again: %s", @@ -187,16 +185,13 @@ async def async_setup_entry( ) return False except ISYConnectionError as err: - _LOGGER.error( - "Failed to connect to the ISY, please adjust settings and try again: %s", - err, - ) - raise ConfigEntryNotReady from err + raise ConfigEntryNotReady( + f"Failed to connect to the ISY, please adjust settings and try again: {err}" + ) from err except ISYResponseParseError as err: - _LOGGER.warning( - "Error processing responses from the ISY; device may be busy, trying again later" - ) - raise ConfigEntryNotReady from err + raise ConfigEntryNotReady( + f"Invalid XML response from ISY; Ensure the ISY is running the latest firmware: {err}" + ) from err _categorize_nodes(hass_isy_data, isy.nodes, ignore_identifier, sensor_identifier) _categorize_programs(hass_isy_data, isy.programs)