From 3884a68889e0419373e637cf03f53471b57ac07c Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Fri, 18 Oct 2019 11:30:05 +0200 Subject: [PATCH] fix: add stacktrace when recover. --- pkg/middlewares/recovery/recovery.go | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkg/middlewares/recovery/recovery.go b/pkg/middlewares/recovery/recovery.go index 563d52e66..b7e83f673 100644 --- a/pkg/middlewares/recovery/recovery.go +++ b/pkg/middlewares/recovery/recovery.go @@ -3,6 +3,7 @@ package recovery import ( "context" "net/http" + "runtime" "github.com/containous/traefik/v2/pkg/log" "github.com/containous/traefik/v2/pkg/middlewares" @@ -28,13 +29,30 @@ func New(ctx context.Context, next http.Handler, name string) (http.Handler, err } func (re *recovery) ServeHTTP(rw http.ResponseWriter, req *http.Request) { - defer recoverFunc(middlewares.GetLoggerCtx(req.Context(), re.name, typeName), rw) + defer recoverFunc(middlewares.GetLoggerCtx(req.Context(), re.name, typeName), rw, req) re.next.ServeHTTP(rw, req) } -func recoverFunc(ctx context.Context, rw http.ResponseWriter) { +func recoverFunc(ctx context.Context, rw http.ResponseWriter, r *http.Request) { if err := recover(); err != nil { - log.FromContext(ctx).Errorf("Recovered from panic in http handler: %+v", err) + if !shouldLogPanic(err) { + log.FromContext(ctx).Debugf("Request has been aborted [%s - %s]: %v", r.RemoteAddr, r.URL, err) + return + } + + log.FromContext(ctx).Errorf("Recovered from panic in HTTP handler [%s - %s]: %+v", r.RemoteAddr, r.URL, err) + + const size = 64 << 10 + buf := make([]byte, size) + buf = buf[:runtime.Stack(buf, false)] + log.FromContext(ctx).Errorf("Stack: %s", buf) + http.Error(rw, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) } } + +// https://github.com/golang/go/blob/a0d6420d8be2ae7164797051ec74fa2a2df466a1/src/net/http/server.go#L1761-L1775 +// 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 +}