github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9031 from thaJeztah/revert_log_var

Browse Source 
Revert "log: define G() as a function instead of a variable"
This commit is contained in:
Derek McGowan 2023-08-31 06:55:41 -07:00 committed by GitHub
commit b2f46463b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
log/context.go
View File

@ -44,6 +44,12 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
// G is a shorthand for [GetLogger].
//
// We may want to define this locally to a package to get package tagged log
// messages.
var G = GetLogger
// L is an alias for the standard logger. // L is an alias for the standard logger.
var L = &Entry{ var L = &Entry{
Logger: logrus.StandardLogger(), Logger: logrus.StandardLogger(),
@ -169,11 +175,6 @@ func WithLogger(ctx context.Context, logger *Entry) context.Context {
// GetLogger retrieves the current logger from the context. If no logger is // GetLogger retrieves the current logger from the context. If no logger is
// available, the default logger is returned. // available, the default logger is returned.
func GetLogger(ctx context.Context) *Entry { func GetLogger(ctx context.Context) *Entry {
return G(ctx)
}
// G is a shorthand for [GetLogger].
func G(ctx context.Context) *Entry {
if logger := ctx.Value(loggerKey{}); logger != nil { if logger := ctx.Value(loggerKey{}); logger != nil {
return logger.(*Entry) return logger.(*Entry)
} }