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

Use new format for logging exceptions - docker/init.py (#3189)

Browse Source
This commit is contained in:
Vedant Bhamare 2021-10-03 16:03:55 +05:30 committed by GitHub
parent 6c679b07e1
commit ad2566d58a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
supervisor/docker/__init__.py
View File

@ -149,14 +149,17 @@ class DockerAPI:
f"{image}:{tag}", use_config_proxy=False, **kwargs
)
except docker.errors.NotFound as err:
_LOGGER.error("Image %s not exists for %s", image, name)
raise DockerNotFound() from err
raise DockerNotFound(
f"Image {image} not exists for {name}", _LOGGER.error
) from err
except docker.errors.DockerException as err:
_LOGGER.error("Can't create container from %s: %s", name, err)
raise DockerAPIError() from err
raise DockerAPIError(
f"Can't create container from {name}: {err}", _LOGGER.error
) from err
except requests.RequestException as err:
_LOGGER.error("Dockerd connection issue for %s: %s", name, err)
raise DockerRequestError() from err
raise DockerRequestError(
f"Dockerd connection issue for {name}: {err}", _LOGGER.error
) from err
# Attach network
if not network_mode:
@ -186,11 +189,11 @@ class DockerAPI:
try:
container.start()
except docker.errors.DockerException as err:
_LOGGER.error("Can't start %s: %s", name, err)
raise DockerAPIError() from err
raise DockerAPIError(f"Can't start {name}: {err}", _LOGGER.error) from err
except requests.RequestException as err:
_LOGGER.error("Dockerd connection issue for %s: %s", name, err)
raise DockerRequestError() from err
raise DockerRequestError(
f"Dockerd connection issue for {name}: {err}", _LOGGER.error
) from err
# Update metadata
with suppress(docker.errors.DockerException, requests.RequestException):
@ -228,8 +231,7 @@ class DockerAPI:
output = container.logs(stdout=stdout, stderr=stderr)
except (docker.errors.DockerException, requests.RequestException) as err:
_LOGGER.error("Can't execute command: %s", err)
raise DockerError() from err
raise DockerError(f"Can't execute command: {err}", _LOGGER.error) from err
finally:
# cleanup container