log: WithLogger: remove redundant intermediate var

thaJeztah · thaJeztah · commit 7aa4f8fdccea · 2023-08-24T00:28:37.000+02:00
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 4a36022) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/log/context.go b/log/context.go
@@ -103,8 +103,7 @@ func SetFormat(format string) error {
 // WithLogger returns a new context with the provided logger. Use in
 // combination with logger.WithField(s) for great effect.
 func WithLogger(ctx context.Context, logger *logrus.Entry) context.Context {
-	e := logger.WithContext(ctx)
-	return context.WithValue(ctx, loggerKey{}, e)
+	return context.WithValue(ctx, loggerKey{}, logger.WithContext(ctx))
 }
 
 // GetLogger retrieves the current logger from the context. If no logger is

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,7 @@ func SetFormat(format string) error {`
`103`	`103`	`// WithLogger returns a new context with the provided logger. Use in`
`104`	`104`	`// combination with logger.WithField(s) for great effect.`
`105`	`105`	`func WithLogger(ctx context.Context, logger *logrus.Entry) context.Context {`
`106`		`- e := logger.WithContext(ctx)`
`107`		`- return context.WithValue(ctx, loggerKey{}, e)`
	`106`	`+ return context.WithValue(ctx, loggerKey{}, logger.WithContext(ctx))`
`108`	`107`	`}`
`109`	`108`
`110`	`109`	`// GetLogger retrieves the current logger from the context. If no logger is`