1
0
mirror of https://github.com/labstack/echo.git synced 2025-07-17 01:43:02 +02:00
Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana
2019-10-30 19:01:23 -07:00
parent 8b7220f97c
commit c50c67783f
2 changed files with 9 additions and 7 deletions

View File

@ -1,10 +1,8 @@
language: go language: go
go: go:
- 1.11.x
- 1.12.x - 1.12.x
- 1.13.x
- tip - tip
env:
- GO111MODULE=on
install: install:
- go get -v golang.org/x/lint/golint - go get -v golang.org/x/lint/golint
script: script:

12
echo.go
View File

@ -354,10 +354,14 @@ func (e *Echo) DefaultHTTPErrorHandler(err error, c Context) {
Message: http.StatusText(http.StatusInternalServerError), Message: http.StatusText(http.StatusInternalServerError),
} }
} }
// Issue #1426
code := he.Code
message := he.Message
if e.Debug { if e.Debug {
he.Message = err.Error() message = err.Error()
} else if m, ok := he.Message.(string); ok { } else if m, ok := message.(string); ok {
he.Message = Map{"message": m} message = Map{"message": m}
} }
// Send response // Send response
@ -365,7 +369,7 @@ func (e *Echo) DefaultHTTPErrorHandler(err error, c Context) {
if c.Request().Method == http.MethodHead { // Issue #608 if c.Request().Method == http.MethodHead { // Issue #608
err = c.NoContent(he.Code) err = c.NoContent(he.Code)
} else { } else {
err = c.JSON(he.Code, he.Message) err = c.JSON(code, message)
} }
if err != nil { if err != nil {
e.Logger.Error(err) e.Logger.Error(err)