mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 21:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix overriding previous logger in context

Browse source
This commit is contained in:
Deluan 2022-12-14 11:50:16 -05:00
parent 6c4a0be6ff
commit 6489dd4478
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/players.go
View file

@ -38,7 +38,7 @@ func (p *players) Register(ctx context.Context, id, client, userAgent, ip string
if err != nil || id == "" { if err != nil || id == "" {
plr, err = p.ds.Player(ctx).FindMatch(userName, client, userAgent) plr, err = p.ds.Player(ctx).FindMatch(userName, client, userAgent)
if err == nil { if err == nil {
log.Debug("Found matching player", "id", plr.ID, "client", client, "username", userName, "type", userAgent) log.Debug(ctx, "Found matching player", "id", plr.ID, "client", client, "username", userName, "type", userAgent)
} else { } else {
plr = &model.Player{ plr = &model.Player{
ID: uuid.NewString(), ID: uuid.NewString(),

6
log/log.go
View file

@ -127,7 +127,11 @@ func NewContext(ctx context.Context, keyValuePairs ...interface{}) context.Conte
ctx = context.Background() ctx = context.Background()
} }
logger := addFields(createNewLogger(), keyValuePairs) logger, ok := ctx.Value(loggerCtxKey).(*logrus.Entry)
if !ok {
logger = createNewLogger()
}
logger = addFields(logger, keyValuePairs)
ctx = context.WithValue(ctx, loggerCtxKey, logger) ctx = context.WithValue(ctx, loggerCtxKey, logger)
return ctx return ctx

1
server/subsonic/middlewares.go
View file

@ -100,7 +100,6 @@ func authenticate(ds model.DataStore) func(next http.Handler) http.Handler {
ctx = log.NewContext(r.Context(), "username", username) ctx = log.NewContext(r.Context(), "username", username)
ctx = request.WithUser(ctx, *usr) ctx = request.WithUser(ctx, *usr)
ctx = request.WithUsername(ctx, usr.UserName)
r = r.WithContext(ctx) r = r.WithContext(ctx)
next.ServeHTTP(w, r) next.ServeHTTP(w, r)