Merge pull request grafana#3575 from piotr1212/no_username_in_render_logging

bergquist · bergquist · commit fabaf5cc04bd · 2015-12-21T13:31:10.000+01:00
Fix empty username in http log for /render calls
diff --git a/pkg/middleware/logger.go b/pkg/middleware/logger.go
@@ -29,14 +29,14 @@ func Logger() macaron.Handler {
 	return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) {
 		start := time.Now()
 
-		rw := res.(macaron.ResponseWriter)
-		c.Next()
-
 		uname := c.GetCookie(setting.CookieUserName)
 		if len(uname) == 0 {
 			uname = "-"
 		}
 
+		rw := res.(macaron.ResponseWriter)
+		c.Next()
+
 		content := fmt.Sprintf("Completed %s %s \"%s %s %s\" %v %s %d bytes in %dus", c.RemoteAddr(), uname, req.Method, req.URL.Path, req.Proto, rw.Status(), http.StatusText(rw.Status()), rw.Size(), time.Since(start)/time.Microsecond)
 
 		switch rw.Status() {
