electricdusk/rushlink
3
3
Fork 3
Code Issues 21 Pull Requests 2 Releases Activity

Merge pull request 'Add request logging to panic recovery' (#63) from issue-61 into master

Browse Source
This commit is contained in:
Daan Sprenkels 2020-07-06 17:12:59 +02:00
commit bbfe64a3a2
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
router.go
View File

@ -30,11 +30,15 @@ func (rl *rushlink) RootURL() *url.URL {
func (rl *rushlink) recoveryMiddleware(next http.Handler) http.Handler { func (rl *rushlink) recoveryMiddleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
logRequestInfo := func() {
log.Printf("in request: %v - %v %q %v", r.RemoteAddr, r.Method, r.RequestURI, r.Proto)
}
defer func() { defer func() {
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
w.WriteHeader(500) w.WriteHeader(500)
log.Printf("error: panic while recovering from another panic: %v\n", err) log.Printf("error: panic while recovering from another panic: %v\n", err)
logRequestInfo()
debug.PrintStack() debug.PrintStack()
fmt.Fprintf(w, "internal server error: %v\n", err) fmt.Fprintf(w, "internal server error: %v\n", err)
} }
@ -43,6 +47,7 @@ func (rl *rushlink) recoveryMiddleware(next http.Handler) http.Handler {
if err := recover(); err != nil { if err := recover(); err != nil {
w.WriteHeader(500) w.WriteHeader(500)
log.Printf("error: %v\n", err) log.Printf("error: %v\n", err)
logRequestInfo()
debug.PrintStack() debug.PrintStack()
rl.renderInternalServerError(w, r, err) rl.renderInternalServerError(w, r, err)
} }