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

Use new format for logging exceptions - docker/interface.py (#3184)

Browse Source 
Co-authored-by: Joakim Sørensen <hi@ludeeus.dev>
Co-authored-by: Ludeeus <ludeeus@ludeeus.dev>
This commit is contained in:
Balamurugan P 2021-10-05 02:19:55 +05:30 committed by GitHub
parent eba6da485d
commit a6d1078fe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
supervisor/docker/interface.py
View File

@ -334,15 +334,15 @@ class DockerInterface(CoreSysAttributes):
try: try:
docker_container = self.sys_docker.containers.get(self.name) docker_container = self.sys_docker.containers.get(self.name)
except (docker.errors.DockerException, requests.RequestException) as err: except (docker.errors.DockerException, requests.RequestException) as err:
_LOGGER.error("%s not found for starting up", self.name) raise DockerError(
raise DockerError() from err f"{self.name} not found for starting up", _LOGGER.error
) from err
_LOGGER.info("Starting %s", self.name) _LOGGER.info("Starting %s", self.name)
try: try:
docker_container.start() docker_container.start()
except (docker.errors.DockerException, requests.RequestException) as err: except (docker.errors.DockerException, requests.RequestException) as err:
_LOGGER.error("Can't start %s: %s", self.name, err) raise DockerError(f"Can't start {self.name}: {err}", _LOGGER.error) from err
raise DockerError() from err
@process_lock @process_lock
def remove(self) -> Awaitable[None]: def remove(self) -> Awaitable[None]:
@ -370,8 +370,9 @@ class DockerInterface(CoreSysAttributes):
) )
except (docker.errors.DockerException, requests.RequestException) as err: except (docker.errors.DockerException, requests.RequestException) as err:
_LOGGER.warning("Can't remove image %s: %s", self.image, err) raise DockerError(
raise DockerError() from err f"Can't remove image {self.image}: {err}", _LOGGER.warning
) from err
self._meta = None self._meta = None
@ -439,15 +440,17 @@ class DockerInterface(CoreSysAttributes):
try: try:
origin = self.sys_docker.images.get(f"{self.image}:{self.version!s}") origin = self.sys_docker.images.get(f"{self.image}:{self.version!s}")
except (docker.errors.DockerException, requests.RequestException) as err: except (docker.errors.DockerException, requests.RequestException) as err:
_LOGGER.warning("Can't find %s for cleanup", self.image) raise DockerError(
raise DockerError() from err f"Can't find {self.image} for cleanup", _LOGGER.warning
) from err
# Cleanup Current # Cleanup Current
try: try:
images_list = self.sys_docker.images.list(name=self.image) images_list = self.sys_docker.images.list(name=self.image)
except (docker.errors.DockerException, requests.RequestException) as err: except (docker.errors.DockerException, requests.RequestException) as err:
_LOGGER.warning("Corrupt docker overlayfs found: %s", err) raise DockerError(
raise DockerError() from err f"Corrupt docker overlayfs found: {err}", _LOGGER.warning
) from err
for image in images_list: for image in images_list:
if origin.id == image.id: if origin.id == image.id:
@ -464,8 +467,9 @@ class DockerInterface(CoreSysAttributes):
try: try:
images_list = self.sys_docker.images.list(name=old_image) images_list = self.sys_docker.images.list(name=old_image)
except (docker.errors.DockerException, requests.RequestException) as err: except (docker.errors.DockerException, requests.RequestException) as err:
_LOGGER.warning("Corrupt docker overlayfs found: %s", err) raise DockerError(
raise DockerError() from err f"Corrupt docker overlayfs found: {err}", _LOGGER.warning
) from err
for image in images_list: for image in images_list:
if origin.id == image.id: if origin.id == image.id:
@ -494,8 +498,9 @@ class DockerInterface(CoreSysAttributes):
try: try:
container.restart(timeout=self.timeout) container.restart(timeout=self.timeout)
except (docker.errors.DockerException, requests.RequestException) as err: except (docker.errors.DockerException, requests.RequestException) as err:
_LOGGER.warning("Can't restart %s: %s", self.image, err) raise DockerError(
raise DockerError() from err f"Can't restart {self.image}: {err}", _LOGGER.warning
) from err
@process_lock @process_lock
def execute_command(self, command: str) -> Awaitable[CommandReturn]: def execute_command(self, command: str) -> Awaitable[CommandReturn]:
@ -527,8 +532,9 @@ class DockerInterface(CoreSysAttributes):
stats = docker_container.stats(stream=False) stats = docker_container.stats(stream=False)
return DockerStats(stats) return DockerStats(stats)
except (docker.errors.DockerException, requests.RequestException) as err: except (docker.errors.DockerException, requests.RequestException) as err:
_LOGGER.error("Can't read stats from %s: %s", self.name, err) raise DockerError(
raise DockerError() from err f"Can't read stats from {self.name}: {err}", _LOGGER.error
) from err
def is_failed(self) -> Awaitable[bool]: def is_failed(self) -> Awaitable[bool]:
"""Return True if Docker is failing state. """Return True if Docker is failing state.
@ -578,11 +584,13 @@ class DockerInterface(CoreSysAttributes):
raise ValueError() raise ValueError()
except (docker.errors.DockerException, ValueError) as err: except (docker.errors.DockerException, ValueError) as err:
_LOGGER.info("No version found for %s", self.image) raise DockerNotFound(
raise DockerNotFound() from err f"No version found for {self.image}", _LOGGER.info
) from err
except requests.RequestException as err: except requests.RequestException as err:
_LOGGER.warning("Communication issues with dockerd on Host: %s", err) raise DockerRequestError(
raise DockerRequestError() from err f"Communication issues with dockerd on Host: {err}", _LOGGER.warning
) from err
else: else:
_LOGGER.info("Found %s versions: %s", self.image, available_version) _LOGGER.info("Found %s versions: %s", self.image, available_version)