Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor logger.New to accept FieldLogger #824

Merged
merged 3 commits into from
Mar 13, 2023
Merged

Refactor logger.New to accept FieldLogger #824

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
171cc76
Refactor logger.New to accept FieldLogger
inancgumus Mar 10, 2023
c5b1746
fixup! always use a logger no matter what
inancgumus Mar 10, 2023
7d0c6a3
fixup! respect our logger
inancgumus Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions log/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,21 @@ func NewNullLogger() *Logger {
}

// New creates a new logger.
func New(logger *logrus.Logger, iterID string) *Logger {
var defLogger bool
func New(logger logrus.FieldLogger, iterID string) *Logger {
ll := logrus.New()

if logger == nil {
defLogger = true
logger = logrus.New()
ll.Warn("Logger", "no logger supplied, using default")
} else if l, ok := logger.(*logrus.Logger); !ok {
ll.Warn("Logger", "invalid logger type, using default")
inancgumus marked this conversation as resolved.
Show resolved Hide resolved
} else {
ll = l
}
l := &Logger{
Logger: logger,

return &Logger{
Logger: ll,
iterID: iterID,
}
if defLogger {
l.Warnf("Logger", "no logger supplied, using default")
}

return l
}

// Tracef logs a trace message.
Expand Down