blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2025-10-18 06:42:10 +08:00
Code Issues Projects Releases Wiki Activity

Merge 47190b0bbf199e0f0a7025d1c20ba31c9f427d18 into 5e40c1d49c21bf989e8d54dbd555086f06d4fb8a

Browse Source
This commit is contained in:
letsfire 2020-05-27 12:16:52 +00:00 committed by GitHub
commit fe720e0a71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
recovery.go
View File

@ -33,6 +33,19 @@ func Recovery() HandlerFunc {
// RecoveryWithWriter returns a middleware for a given writer that recovers from any panics and writes a 500 if there was one.
func RecoveryWithWriter(out io.Writer) HandlerFunc {
return RecoveryWithWriterAndCallback(out, func(c *Context, err interface{}, brokenPipe bool) {
// If the connection is dead, we can't write a status to it.
if brokenPipe {
c.Error(err.(error)) // nolint: errcheck
c.Abort()
} else {
c.AbortWithStatus(http.StatusInternalServerError)
}
})
}
// RecoveryWithWriterAndCallback returns a middleware for a given writer that recovers from any panics and call the custom function if there was one.
func RecoveryWithWriterAndCallback(out io.Writer, fn func(c *Context, err interface{}, brokenPipe bool)) HandlerFunc {
var logger *log.Logger
if out != nil {
logger = log.New(out, "\n\n\x1b[31m", log.LstdFlags)
@ -70,14 +83,7 @@ func RecoveryWithWriter(out io.Writer) HandlerFunc {
timeFormat(time.Now()), err, stack, reset)
}
}
// If the connection is dead, we can't write a status to it.
if brokenPipe {
c.Error(err.(error)) // nolint: errcheck
c.Abort()
} else {
c.AbortWithStatus(http.StatusInternalServerError)
}
fn(c, err, brokenPipe)
}
}()
c.Next()