Przeglądaj źródła

Merge pull request #3575 from piotr1212/no_username_in_render_logging

Fix empty username in http log for /render calls
Carl Bergquist 10 lat temu
rodzic
commit
fabaf5cc04
1 zmienionych plików z 3 dodań i 3 usunięć
  1. 3 3
      pkg/middleware/logger.go

+ 3 - 3
pkg/middleware/logger.go

@@ -29,14 +29,14 @@ func Logger() macaron.Handler {
 	return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) {
 	return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) {
 		start := time.Now()
 		start := time.Now()
 
 
-		rw := res.(macaron.ResponseWriter)
-		c.Next()
-
 		uname := c.GetCookie(setting.CookieUserName)
 		uname := c.GetCookie(setting.CookieUserName)
 		if len(uname) == 0 {
 		if len(uname) == 0 {
 			uname = "-"
 			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)
 		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() {
 		switch rw.Status() {