From ebdceb8e529810cd89599b8fbfda0157a659f3b5 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 1 Jun 2018 13:07:56 -0700 Subject: Adding mlog to context. (#8882) --- web/handlers.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'web/handlers.go') diff --git a/web/handlers.go b/web/handlers.go index e2521674a..363b05c59 100644 --- a/web/handlers.go +++ b/web/handlers.go @@ -55,6 +55,8 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { c.RequestId = model.NewId() c.IpAddress = utils.GetIpAddress(r) c.Params = ParamsFromRequest(r) + c.Path = r.URL.Path + c.Log = c.App.Log token, tokenLocation := app.ParseAuthTokenFromRequest(r) @@ -88,7 +90,7 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { session, err := c.App.GetSession(token) if err != nil { - mlog.Info(fmt.Sprintf("Invalid session err=%v", err.Error())) + c.Log.Info("Invalid session", mlog.Err(err)) if err.StatusCode == http.StatusInternalServerError { c.Err = err } else if h.RequireSession { @@ -107,7 +109,13 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } } - c.Path = r.URL.Path + c.Log = c.App.Log.With( + mlog.String("path", c.Path), + mlog.String("request_id", c.RequestId), + mlog.String("ip_addr", c.IpAddress), + mlog.String("user_id", c.Session.UserId), + mlog.String("method", r.Method), + ) if c.Err == nil && h.RequireSession { c.SessionRequired() -- cgit v1.2.3-1-g7c22