From 3ced8397c517bbe1c9f5992e3e53919564b41305 Mon Sep 17 00:00:00 2001 From: Umputun Date: Mon, 12 Apr 2021 12:08:50 -0500 Subject: [PATCH] upgrade recoverer to suppress the noise on net/http: abort Handler --- go.mod | 2 +- go.sum | 2 ++ vendor/github.com/go-pkgz/rest/middleware.go | 4 +++- vendor/modules.txt | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fd07b8b..3542c59 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/fsouza/go-dockerclient v1.7.2 github.com/go-pkgz/lgr v0.10.4 - github.com/go-pkgz/rest v1.9.0 + github.com/go-pkgz/rest v1.9.1 github.com/gorilla/handlers v1.5.1 github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index cdf8978..0e1184a 100644 --- a/go.sum +++ b/go.sum @@ -49,6 +49,8 @@ github.com/go-pkgz/rest v1.8.1 h1:M0sMbgcWxHpKjXw7Z8uF6uNcsLynaPoR0CHGczjYSw0= github.com/go-pkgz/rest v1.8.1/go.mod h1:wZ/dGipZUaF9to0vIQl7PwDHgWQDB0jsrFg1xnAKLDw= github.com/go-pkgz/rest v1.9.0 h1:cbBXd4YH0X6W64zneDGF+Ym3Mgj7Gv54krIEJjbQACs= github.com/go-pkgz/rest v1.9.0/go.mod h1:wZ/dGipZUaF9to0vIQl7PwDHgWQDB0jsrFg1xnAKLDw= +github.com/go-pkgz/rest v1.9.1 h1:JW876BgJJ/MOkAYRnnzpfX7xUqIav+ou1LSVTtQq/Lo= +github.com/go-pkgz/rest v1.9.1/go.mod h1:wZ/dGipZUaF9to0vIQl7PwDHgWQDB0jsrFg1xnAKLDw= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= diff --git a/vendor/github.com/go-pkgz/rest/middleware.go b/vendor/github.com/go-pkgz/rest/middleware.go index 70e10e5..a40e02c 100644 --- a/vendor/github.com/go-pkgz/rest/middleware.go +++ b/vendor/github.com/go-pkgz/rest/middleware.go @@ -60,7 +60,9 @@ func Recoverer(l logger.Backend) func(http.Handler) http.Handler { defer func() { if rvr := recover(); rvr != nil { l.Logf("request panic for %s from %s, %v", r.URL.String(), r.RemoteAddr, rvr) - l.Logf(string(debug.Stack())) + if rvr != http.ErrAbortHandler { + l.Logf(string(debug.Stack())) + } http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) } }() diff --git a/vendor/modules.txt b/vendor/modules.txt index 30db1d8..02ad009 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -70,7 +70,7 @@ github.com/fsouza/go-dockerclient # github.com/go-pkgz/lgr v0.10.4 ## explicit github.com/go-pkgz/lgr -# github.com/go-pkgz/rest v1.9.0 +# github.com/go-pkgz/rest v1.9.1 ## explicit github.com/go-pkgz/rest github.com/go-pkgz/rest/logger