Update LoggingAndRecovery middleware

- added option for color or not
- updated status colors to be constants.

Author: Dean Karn

README.md

@@ -1,6 +1,6 @@
 ##Pure
 <img align="right" src="https://raw.githubusercontent.com/go-playground/pure/master/logo.png">
-![Project status](https://img.shields.io/badge/version-2.2.1-green.svg)
+![Project status](https://img.shields.io/badge/version-2.3.0-green.svg)
 [![Build Status](https://semaphoreci.com/api/v1/joeybloggs/pure/branches/master/badge.svg)](https://semaphoreci.com/joeybloggs/pure)
 [![Coverage Status](https://coveralls.io/repos/github/go-playground/pure/badge.svg?branch=master)](https://coveralls.io/github/go-playground/pure?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/go-playground/pure)](https://goreportcard.com/report/github.com/go-playground/pure)
@@ -44,7 +44,7 @@ import (
 func main() {
 
 	p := pure.New()
-	p.Use(mw.LoggingAndRecovery)
+	p.Use(mw.LoggingAndRecovery(true))
 
 	p.Get("/", helloWorld)
 

examples/basic/main.go

@@ -10,7 +10,7 @@ import (
 func main() {
 
 	p := pure.New()
-	p.Use(mw.LoggingAndRecovery)
+	p.Use(mw.LoggingAndRecovery(true))
 
 	p.Get("/", helloWorld)
 

examples/middleware/logging-recovery/logging_recovery.go

@@ -6,6 +6,8 @@ import (
 	"runtime"
 	"sync"
 	"time"
+
+	"github.com/go-playground/pure"
 )
 
 // ANSIEscSeq is a predefined ANSI escape sequence
@@ -36,6 +38,13 @@ const (
 	Reset                   = "\x1b[0m"
 )
 
+const (
+	status500 = Underscore + Blink + Red
+	status400 = Red
+	status300 = Yellow
+	status    = Green
+)
+
 type logWriter struct {
 	http.ResponseWriter
 	status    int
@@ -89,50 +98,84 @@ var lrpool = sync.Pool{
 }
 
 // LoggingAndRecovery handle HTTP request logging + recovery
-func LoggingAndRecovery(next http.HandlerFunc) http.HandlerFunc {
+func LoggingAndRecovery(color bool) pure.Middleware {
 
-	return func(w http.ResponseWriter, r *http.Request) {
+	return func(next http.HandlerFunc) http.HandlerFunc {
 
-		t1 := time.Now()
+		if color {
 
-		lw := lrpool.Get().(*logWriter)
-		lw.status = 200
-		lw.size = 0
-		lw.committed = false
-		lw.ResponseWriter = w
+			return func(w http.ResponseWriter, r *http.Request) {
 
-		defer func() {
-			if err := recover(); err != nil {
-				trace := make([]byte, 1<<16)
-				n := runtime.Stack(trace, true)
-				log.Printf(" %srecovering from panic: %+v\nStack Trace:\n %s%s", Red, err, trace[:n], Reset)
-				HandlePanic(lw, r, trace[:n])
+				t1 := time.Now()
 
-				lrpool.Put(lw)
-				return
+				lw := lrpool.Get().(*logWriter)
+				lw.status = 200
+				lw.size = 0
+				lw.committed = false
+				lw.ResponseWriter = w
+
+				defer func() {
+					if err := recover(); err != nil {
+						trace := make([]byte, 1<<16)
+						n := runtime.Stack(trace, true)
+						log.Printf(" %srecovering from panic: %+v\nStack Trace:\n %s%s", Red, err, trace[:n], Reset)
+						HandlePanic(lw, r, trace[:n])
+
+						lrpool.Put(lw)
+						return
+					}
+
+					lrpool.Put(lw)
+				}()
+
+				next(lw, r)
+
+				// var color string
+				color := status
+
+				code := lw.Status()
+
+				switch {
+				case code >= http.StatusInternalServerError:
+					color = status500
+				case code >= http.StatusBadRequest:
+					color = status400
+				case code >= http.StatusMultipleChoices:
+					color = status300
+				default:
+					color = status
+				}
+
+				log.Printf("%s %d %s[%s%s%s] %q %v %d\n", color, code, Reset, color, r.Method, Reset, r.URL, time.Since(t1), lw.Size())
 			}
+		}
+
+		return func(w http.ResponseWriter, r *http.Request) {
 
-			lrpool.Put(lw)
-		}()
+			t1 := time.Now()
 
-		next(lw, r)
+			lw := lrpool.Get().(*logWriter)
+			lw.status = 200
+			lw.size = 0
+			lw.committed = false
+			lw.ResponseWriter = w
 
-		var color string
+			defer func() {
+				if err := recover(); err != nil {
+					trace := make([]byte, 1<<16)
+					n := runtime.Stack(trace, true)
+					log.Printf(" %srecovering from panic: %+v\nStack Trace:\n %s%s", Red, err, trace[:n], Reset)
+					HandlePanic(lw, r, trace[:n])
+				}
+
+				lrpool.Put(lw)
+			}()
 
-		code := lw.Status()
+			next(lw, r)
 
-		switch {
-		case code >= http.StatusInternalServerError:
-			color = Underscore + Blink + Red
-		case code >= http.StatusBadRequest:
-			color = Red
-		case code >= http.StatusMultipleChoices:
-			color = Yellow
-		default:
-			color = Green
+			log.Printf("%d [%s] %q %v %d\n", lw.Status(), r.Method, r.URL, time.Since(t1), lw.Size())
 		}
 
-		log.Printf("%s %d %s[%s%s%s] %q %v %d\n", color, code, Reset, color, r.Method, Reset, r.URL, time.Since(t1), lw.Size())
 	}
 }