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

Fix panic stack trace being printed during recovery of broken pipe (#1089)

Browse Source
This commit is contained in:
Justin Israel 2018-02-27 14:04:40 +13:00 committed by Justin Israel
parent 5d3f30cfc8
commit 80916dc43d
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
recovery.go
View File

@ -10,8 +10,11 @@ import (
"io"
"io/ioutil"
"log"
"net"
"net/http/httputil"
"os"
"runtime"
"syscall"
)
var (
@ -35,13 +38,34 @@ func RecoveryWithWriter(out io.Writer) HandlerFunc {
return func(c *Context) {
defer func() {
if err := recover(); err != nil {
if logger != nil {
stack := stack(3)
httprequest, _ := httputil.DumpRequest(c.Request, false)
logger.Printf("[Recovery] panic recovered:\n%s\n%s\n%s%s", string(httprequest), err, stack, reset)
// Check for a broken connection, as it is not really a
// condition that warrants a panic stack trace.
var brokenPipe bool
if ne, ok := err.(*net.OpError); ok {
if se, ok := ne.Err.(*os.SyscallError); ok {
if se.Err == syscall.EPIPE || se.Err == syscall.ECONNRESET {
brokenPipe = true
}
}
}
if logger != nil {
httprequest, _ := httputil.DumpRequest(c.Request, false)
if brokenPipe {
logger.Printf("%s\n%s%s", err, string(httprequest), reset)
} else {
logger.Printf("[Recovery] panic recovered:\n%s\n%s\n%s%s",
string(httprequest), err, stack(3), reset)
}
}
// If the connection is dead, we can't write a status to it.
if brokenPipe {
c.Error(err.(error))
c.Abort()
} else {
c.AbortWithStatus(500)
}
}
}()
c.Next()
}