Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions log/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,37 @@ type LogOptions struct {
}

func InitLog(opts *LogOptions) {
Log = newLogger()
Log.SetLevel(logrus.DebugLevel) // default
Log = New(opts)
}

// New returns a new local Logger.
func New(opts *LogOptions) Logger {
nl := newLogger()
nl.SetLevel(logrus.DebugLevel) // default
logLevel := param.Lookup("LOG_LEVEL", "/replicated/log_level", false)
if logLevel != "" {
lvl, err := logrus.ParseLevel(logLevel)
if err == nil {
Log.SetLevel(lvl)
nl.SetLevel(lvl)
}
}

Log.logger.AddHook(&CallerHook{})
nl.logger.AddHook(&CallerHook{})

if opts == nil {
return
return nl
}

if opts.UseJSONFormatter {
Log.SetFormatter(&JSONFormatter{})
nl.SetFormatter(&JSONFormatter{})
} else {
Log.SetFormatter(&ConsoleFormatter{})
nl.SetFormatter(&ConsoleFormatter{})
}

if opts.LogLevel != "" {
lvl, err := logrus.ParseLevel(opts.LogLevel)
if err == nil {
Log.SetLevel(lvl)
nl.SetLevel(lvl)
}
}

Expand All @@ -72,8 +77,10 @@ func InitLog(opts *LogOptions) {
golog.Fatal(err)
}

Log.AddHook(hook)
nl.AddHook(hook)
}

return nl
}

func WithField(key string, value interface{}) *logrus.Entry {
Expand Down