jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-11-12 04:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract exception message from chain for API errors (#2100)

Browse Source 
* Get message from excepiton chain

* cleanup
This commit is contained in:
Joakim Sørensen
2020-10-06 15:53:58 +02:00
committed by GitHub
parent 9dc2f43ffb
commit 17559bfc8e
4 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
supervisor/api/utils.py
View File

@@ -17,7 +17,8 @@ from ..const import (
RESULT_ERROR,
RESULT_OK,
)
from ..exceptions import APIError, APIForbidden, HassioError
from ..exceptions import APIError, APIForbidden, DockerAPIError, HassioError
from ..utils import check_exception_chain, get_message_from_exception_chain
from ..utils.log_format import format_message
@@ -57,12 +58,8 @@ def api_process(method):
"""Return API information."""
try:
answer = await method(api, *args, **kwargs)
except (APIError, APIForbidden) as err:
return api_return_error(message=str(err))
except HassioError as err:
return api_return_error(
message=str(err) if err else "Unknown Error, see logs"
)
except (APIError, APIForbidden, HassioError) as err:
return api_return_error(error=err)
if isinstance(answer, dict):
return api_return_ok(data=answer)
@@ -100,10 +97,17 @@ def api_process_raw(content):
return wrap_method
def api_return_error(message: Optional[str] = None) -> web.Response:
def api_return_error(error: Optional[Any] = None) -> web.Response:
"""Return an API error message."""
message = get_message_from_exception_chain(error)
if check_exception_chain(error, DockerAPIError):
message = format_message(message)
return web.json_response(
{JSON_RESULT: RESULT_ERROR, JSON_MESSAGE: format_message(message)}, status=400
{
JSON_RESULT: RESULT_ERROR,
JSON_MESSAGE: message or "Unknown error, see supervisor",
},
status=400,
)