Skip to content

send a 500 Internal server error on recovering a panic in log middleware #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2024
Merged

send a 500 Internal server error on recovering a panic in log middleware #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion log_middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,11 @@ func buildSkipCache(cfg LogMiddlewareConfig) ([]*regexp.Regexp, error) {
func (mw *LogMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
start := time.Now()

lrw := &logResponseWriter{ResponseWriter: w}

defer func() {
if rec := recover(); rec != nil {
lrw.WriteHeader(http.StatusInternalServerError)
// See: https://pkg.go.dev/net/http#ErrAbortHandler
if recErr, ok := rec.(error); ok && errors.Is(recErr, http.ErrAbortHandler) {
AccessAborted(r, start)
Expand All @@ -78,7 +81,6 @@ func (mw *LogMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
}()

lrw := &logResponseWriter{ResponseWriter: w}
mw.Next.ServeHTTP(lrw, r)

level := logrus.InfoLevel
Expand Down
10 changes: 8 additions & 2 deletions log_middleware_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,11 @@ func Test_LogMiddleware_Panic(t *testing.T) {
}))

r, _ := http.NewRequest(http.MethodGet, "http://www.example.org/foo", nil)
resp := httptest.NewRecorder()

lm.ServeHTTP(httptest.NewRecorder(), r)
lm.ServeHTTP(resp, r)

assert.Equal(t, http.StatusInternalServerError, resp.Result().StatusCode)

data := logRecordFromBuffer(b)

Expand All @@ -101,8 +104,11 @@ func Test_LogMiddleware_Panic_ErrAbortHandler(t *testing.T) {
}))

r, _ := http.NewRequest(http.MethodGet, "http://www.example.org/foo", nil)
resp := httptest.NewRecorder()

lm.ServeHTTP(httptest.NewRecorder(), r)
lm.ServeHTTP(resp, r)

assert.Equal(t, http.StatusInternalServerError, resp.Result().StatusCode)

data := logRecordFromBuffer(b)

Expand Down