baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix recover from panic handler

Browse source
This commit is contained in:
Michael 2018-10-12 13:04:02 +02:00 committed by Traefiker Bot
parent 5632952665
commit 2c7b7cd6ca
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
middlewares/recover.go
View file

@ -27,7 +27,16 @@ func NegroniRecoverHandler() negroni.Handler {
func recoverFunc(w http.ResponseWriter) {
if err := recover(); err != nil {
log.Errorf("Recovered from panic in http handler: %+v", err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
if shouldLogPanic(err) {
log.Errorf("Recovered from panic in http handler: %+v", err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
} else {
log.Debugf("HTTP handler has been aborted: %v", err)
}
}
}
// https://github.com/golang/go/blob/c33153f7b416c03983324b3e8f869ce1116d84bc/src/net/http/httputil/reverseproxy.go#L284
func shouldLogPanic(panicValue interface{}) bool {
return panicValue != nil && panicValue != http.ErrAbortHandler
}