MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the underlying error

Browse Source
This commit is contained in:
Dane Everitt 2020-12-15 21:14:20 -08:00
parent 0ecc166dcd
commit 057cdbd927
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
router/middleware.go
View File

@ -19,17 +19,17 @@ func (m *Middleware) ErrorHandler() gin.HandlerFunc {
return func(c *gin.Context) { return func(c *gin.Context) {
c.Next() c.Next()
err := c.Errors.Last() err := c.Errors.Last()
if err == nil { if err == nil || err.Err == nil {
return return
} }
tracked := NewTrackedError(err) tracked := NewTrackedError(err.Err)
// If there is a server in the context for this request pull it out so that we can // If there is a server in the context for this request pull it out so that we can
// track the error specifically for that server. // track the error specifically for that server.
if s, ok := c.Get("server"); ok { if s, ok := c.Get("server"); ok {
tracked = NewServerError(err, s.(*server.Server)) tracked = NewServerError(err.Err, s.(*server.Server))
} }
// This error occurs if you submit invalid JSON data to an endpoint. // This error occurs if you submit invalid JSON data to an endpoint.
if err.Error() == io.EOF.Error() { if err.Err.Error() == io.EOF.Error() {
c.JSON(c.Writer.Status(), gin.H{"error": "A JSON formatted body is required for this endpoint."}) c.JSON(c.Writer.Status(), gin.H{"error": "A JSON formatted body is required for this endpoint."})
return return
} }