particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

internal/worker: log internal details when available

Browse source
This commit is contained in:
Diaa Sami 2021-12-06 19:02:33 +01:00 • committed by Tom Gundersen
parent d26a93319c
commit c1aeeeaf0e
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
internal/worker/api/errors.go
View file

@ -148,14 +148,17 @@ func apiErrorFromEchoError(echoError *echo.HTTPError) ServiceErrorCode {
// Convert an echo error into an AOC compliant one so we send a correct json error response
func HTTPErrorHandler(echoError error, c echo.Context) {
doResponse := func(code ServiceErrorCode, c echo.Context) {
doResponse := func(code ServiceErrorCode, c echo.Context, internal error) {
if !c.Response().Committed {
var err error
sec := find(code)
apiErr := APIError(code, sec, c)
if sec.httpStatus == http.StatusInternalServerError {
c.Logger().Errorf("Internal server error. Code: %s, OperationId: %s",
c.Logger().Errorf("Internal server error. Internal: %s, Code: %s, OperationId: %s",
internal, apiErr.Code, apiErr.OperationId)
} else {
c.Logger().Infof("%s, Code: %s, OperationId: %s", internal,
apiErr.Code, apiErr.OperationId)
}
@ -172,15 +175,15 @@ func HTTPErrorHandler(echoError error, c echo.Context) {
he, ok := echoError.(*echo.HTTPError)
if !ok {
doResponse(ErrorNotHTTPError, c)
doResponse(ErrorNotHTTPError, c, he.Internal)
return
}
sec, ok := he.Message.(ServiceErrorCode)
if !ok {
// No service code was set, so Echo threw this error
doResponse(apiErrorFromEchoError(he), c)
doResponse(apiErrorFromEchoError(he), c, he.Internal)
return
}
doResponse(sec, c)
doResponse(sec, c, nil)
}