Skip to content

Commit

Permalink
make DefaultLogger a variable instead of a type
Browse files Browse the repository at this point in the history
Minor cleanup so that you can use `DefaultLogger` instead of
`DefaultLogger{}`.
  • Loading branch information
petermattis committed Oct 10, 2019
1 parent 0a71d1b commit f7eeedc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion event.go
Expand Up @@ -371,7 +371,7 @@ func (l *EventListener) EnsureDefaults(logger Logger) {
// specified logger.
func MakeLoggingEventListener(logger Logger) EventListener {
if logger == nil {
logger = DefaultLogger{}
logger = DefaultLogger
}

return EventListener{
Expand Down
8 changes: 5 additions & 3 deletions logger.go
Expand Up @@ -16,16 +16,18 @@ type Logger interface {
Fatalf(format string, args ...interface{})
}

type defaultLogger struct{}

// DefaultLogger logs to the Go stdlib logs.
type DefaultLogger struct{}
var DefaultLogger defaultLogger

// Infof implements the Logger.Infof interface.
func (DefaultLogger) Infof(format string, args ...interface{}) {
func (defaultLogger) Infof(format string, args ...interface{}) {
_ = log.Output(2, fmt.Sprintf(format, args...))
}

// Fatalf implements the Logger.Fatalf interface.
func (DefaultLogger) Fatalf(format string, args ...interface{}) {
func (defaultLogger) Fatalf(format string, args ...interface{}) {
_ = log.Output(2, fmt.Sprintf(format, args...))
os.Exit(1)
}
2 changes: 1 addition & 1 deletion options.go
Expand Up @@ -394,7 +394,7 @@ func (o *Options) EnsureDefaults() *Options {
}
}
if o.Logger == nil {
o.Logger = DefaultLogger{}
o.Logger = DefaultLogger
}
o.EventListener.EnsureDefaults(o.Logger)
if o.MaxManifestFileSize == 0 {
Expand Down

0 comments on commit f7eeedc

Please sign in to comment.