IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Remove untyped data map from macaron context (#39077)

Browse Source
This commit is contained in:
Serge Zaitsev
2021-09-13 16:41:03 +03:00
committed by GitHub
parent 1c892a2fc4
commit e1e385b318
9 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/contexthandler/contexthandler.go
View File

@@ -121,7 +121,6 @@ func (h *ContextHandler) Middleware(mContext *macaron.Context) {
}
reqContext.Logger = log.New("context", "userId", reqContext.UserId, "orgId", reqContext.OrgId, "uname", reqContext.Login)
reqContext.Data["ctx"] = reqContext
span.LogFields(
ol.String("uname", reqContext.Login),
@@ -299,7 +298,7 @@ func (h *ContextHandler) initContextWithToken(reqContext *models.ReqContext, org
token, err := h.AuthTokenService.LookupToken(ctx, rawToken)
if err != nil {
reqContext.Logger.Error("Failed to look up user based on cookie", "error", err)
reqContext.Data["lookupTokenErr"] = err
reqContext.LookupTokenErr = err
return false
}