From ad2566d58a72f997c5133d49c7642ce4f8d80bd2 Mon Sep 17 00:00:00 2001
From: Vedant Bhamare <55763604+Dark-Knight11@users.noreply.github.com>
Date: Sun, 3 Oct 2021 16:03:55 +0530
Subject: [PATCH] Use new format for logging exceptions - docker/init.py
 (#3189)

---
 supervisor/docker/__init__.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/supervisor/docker/__init__.py b/supervisor/docker/__init__.py
index fd9d99a7a..aa329596c 100644
--- a/supervisor/docker/__init__.py
+++ b/supervisor/docker/__init__.py
@@ -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