Skip to content

Commit

Permalink
log request during panic when in debug mode
Browse files Browse the repository at this point in the history
  • Loading branch information
dustin-decker committed Sep 23, 2018
1 parent 48c3482 commit 21354b1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
8 changes: 7 additions & 1 deletion recovery.go
Expand Up @@ -11,6 +11,7 @@ import (
"io/ioutil"
"log"
"net/http"
"net/http/httputil"
"runtime"
"time"
)
Expand Down Expand Up @@ -38,7 +39,12 @@ func RecoveryWithWriter(out io.Writer) HandlerFunc {
if err := recover(); err != nil {
if logger != nil {
stack := stack(3)
logger.Printf("[Recovery] %s panic recovered:\n%s\n%s%s", timeFormat(time.Now()), err, stack, reset)
if IsDebugging() {
httprequest, _ := httputil.DumpRequest(c.Request, false)
logger.Printf("[Recovery] %s panic recovered:\n%s\n%s\n%s%s", timeFormat(time.Now()), string(httprequest), err, stack, reset)
} else {
logger.Printf("[Recovery] %s panic recovered:\n%s\n%s%s", timeFormat(time.Now()), err, stack, reset)
}
}
c.AbortWithStatus(http.StatusInternalServerError)
}
Expand Down
9 changes: 9 additions & 0 deletions recovery_test.go
Expand Up @@ -27,6 +27,15 @@ func TestPanicInHandler(t *testing.T) {
assert.Contains(t, buffer.String(), "panic recovered")
assert.Contains(t, buffer.String(), "Oupps, Houston, we have a problem")
assert.Contains(t, buffer.String(), "TestPanicInHandler")

// Debug mode prints the request
SetMode(DebugMode)
// RUN
w = performRequest(router, "GET", "/recovery")
// TEST
assert.Equal(t, http.StatusInternalServerError, w.Code)
assert.Contains(t, buffer.String(), "GET /recovery")

}

// TestPanicWithAbort assert that panic has been recovered even if context.Abort was used.
Expand Down

0 comments on commit 21354b1

Please sign in to comment.