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

Adjust "retry in ..." log messages to avoid confusion (#4783)

Browse Source 
As shown in home-assistant/operating-system#3007, error messages printed
to logs when container installation fails can cause some confusion,
because they are sometimes printed to the log on the landing page.
Adjust all wordings of "retry in" to "retrying in" to make it obvious
this happens automatically.
This commit is contained in:
Jan Čermák 2023-12-20 18:34:42 +01:00 committed by GitHub
parent fd3c995c7c
commit ed7edd9fe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
supervisor/homeassistant/core.py
View File

@ -129,7 +129,7 @@ class HomeAssistantCore(JobGroup):
while True:
if not self.sys_updater.image_homeassistant:
_LOGGER.warning(
"Found no information about Home Assistant. Retry in 30sec"
"Found no information about Home Assistant. Retrying in 30sec"
)
await asyncio.sleep(30)
await self.sys_updater.reload()
@ -145,7 +145,7 @@ class HomeAssistantCore(JobGroup):
except Exception as err: # pylint: disable=broad-except
capture_exception(err)
_LOGGER.warning("Fails install landingpage, retry after 30sec")
_LOGGER.warning("Failed to install landingpage, retrying after 30sec")
await asyncio.sleep(30)
self.sys_homeassistant.version = LANDINGPAGE
@ -177,7 +177,7 @@ class HomeAssistantCore(JobGroup):
except Exception as err: # pylint: disable=broad-except
capture_exception(err)
_LOGGER.warning("Error on Home Assistant installation. Retry in 30sec")
_LOGGER.warning("Error on Home Assistant installation. Retrying in 30sec")
await asyncio.sleep(30)
_LOGGER.info("Home Assistant docker now installed")

2
supervisor/plugins/cli.py
View File

@ -66,7 +66,7 @@ class PluginCli(PluginBase):
image=self.sys_updater.image_cli,
)
break
_LOGGER.warning("Error on install cli plugin. Retry in 30sec")
_LOGGER.warning("Error on install cli plugin. Retrying in 30sec")
await asyncio.sleep(30)
_LOGGER.info("CLI plugin is now installed")

2
supervisor/plugins/dns.py
View File

@ -175,7 +175,7 @@ class PluginDns(PluginBase):
self.latest_version, image=self.sys_updater.image_dns
)
break
_LOGGER.warning("Error on install CoreDNS plugin. Retry in 30sec")
_LOGGER.warning("Error on install CoreDNS plugin. Retrying in 30sec")
await asyncio.sleep(30)
_LOGGER.info("CoreDNS plugin now installed")

2
supervisor/plugins/multicast.py
View File

@ -62,7 +62,7 @@ class PluginMulticast(PluginBase):
self.latest_version, image=self.sys_updater.image_multicast
)
break
_LOGGER.warning("Error on install Multicast plugin. Retry in 30sec")
_LOGGER.warning("Error on install Multicast plugin. Retrying in 30sec")
await asyncio.sleep(30)
_LOGGER.info("Multicast plugin is now installed")

2
supervisor/plugins/observer.py
View File

@ -70,7 +70,7 @@ class PluginObserver(PluginBase):
self.latest_version, image=self.sys_updater.image_observer
)
break
_LOGGER.warning("Error on install observer plugin. Retry in 30sec")
_LOGGER.warning("Error on install observer plugin. Retrying in 30sec")
await asyncio.sleep(30)
_LOGGER.info("observer plugin now installed")

8
tests/homeassistant/test_core.py
View File

@ -65,7 +65,7 @@ async def test_install_landingpage_docker_error(
await coresys.homeassistant.core.install_landingpage()
sleep.assert_awaited_once_with(30)
assert "Fails install landingpage, retry after 30sec" in caplog.text
assert "Failed to install landingpage, retrying after 30sec" in caplog.text
capture_exception.assert_not_called()
@ -87,7 +87,7 @@ async def test_install_landingpage_other_error(
await coresys.homeassistant.core.install_landingpage()
sleep.assert_awaited_once_with(30)
assert "Fails install landingpage, retry after 30sec" in caplog.text
assert "Failed to install landingpage, retrying after 30sec" in caplog.text
capture_exception.assert_called_once_with(err)
@ -113,7 +113,7 @@ async def test_install_docker_error(
await coresys.homeassistant.core.install()
sleep.assert_awaited_once_with(30)
assert "Error on Home Assistant installation. Retry in 30sec" in caplog.text
assert "Error on Home Assistant installation. Retrying in 30sec" in caplog.text
capture_exception.assert_not_called()
@ -137,7 +137,7 @@ async def test_install_other_error(
await coresys.homeassistant.core.install()
sleep.assert_awaited_once_with(30)
assert "Error on Home Assistant installation. Retry in 30sec" in caplog.text
assert "Error on Home Assistant installation. Retrying in 30sec" in caplog.text
capture_exception.assert_called_once_with(err)