cleaned up per request logging

default_context.go

@@ -107,6 +107,7 @@ func (d *DefaultContext) Render(status int, rr render.Renderer) error {
 		data["params"] = pp
 		data["flash"] = d.Flash().data
 		data["session"] = d.Session()
+		data["request"] = d.Request()
 		bb := &bytes.Buffer{}
 
 		err := rr.Render(bb, data)

middleware/param_logger.go

@@ -9,17 +9,19 @@ import (
 // ParameterLogger logs form and parameter values to the logger
 func ParameterLogger(next buffalo.Handler) buffalo.Handler {
 	return func(c buffalo.Context) error {
-		req := c.Request()
-		if req.Method != "GET" {
-			b, err := json.Marshal(req.Form)
+		defer func() {
+			req := c.Request()
+			if req.Method != "GET" {
+				b, err := json.Marshal(req.Form)
+				if err == nil {
+					c.LogField("form", string(b))
+				}
+			}
+			b, err := json.Marshal(c.Params())
 			if err == nil {
-				c.LogField("form", string(b))
+				c.LogField("params", string(b))
 			}
-		}
-		b, err := json.Marshal(c.Params())
-		if err == nil {
-			c.LogField("params", string(b))
-		}
+		}()
 		return next(c)
 	}
 }

request_logger.go

@@ -27,20 +27,18 @@ func RequestLoggerFunc(h Handler) Handler {
 		}
 		rid := irid.(string) + "-" + randx.String(10)
 		c.Set("request_id", rid)
+		c.LogField("request_id", rid)
 
 		start := time.Now()
-		c.LogFields(logrus.Fields{
-			"request_id": rid,
-			"method":     c.Request().Method,
-			"path":       c.Request().URL.String(),
-		})
-		ct := c.Request().Header.Get("Content-Type")
-		if ct != "" {
-			c.LogField("content_type", ct)
-		}
 		defer func() {
 			ws := c.Response().(*Response)
+			ct := c.Request().Header.Get("Content-Type")
+			if ct != "" {
+				c.LogField("content_type", ct)
+			}
 			c.LogFields(logrus.Fields{
+				"method":     c.Request().Method,
+				"path":       c.Request().URL.String(),
 				"duration":   time.Since(start),
 				"size":       ws.Size,
 				"human_size": humanize.Bytes(uint64(ws.Size)),