diff --git a/fasthttp.go b/fasthttp.go index 8028cd0..6c82f68 100644 --- a/fasthttp.go +++ b/fasthttp.go @@ -3,5 +3,5 @@ package log type FHLogger struct{} func (fhl FHLogger) Printf(format string, v ...interface{}) { - logger.Printf(format, v...) + Printf(format, v...) } diff --git a/logger.go b/logger.go index b9febab..726041f 100644 --- a/logger.go +++ b/logger.go @@ -35,7 +35,7 @@ var logger, _ = newZerolog( Format: FormatText, Caller: &CallerConfig{CallerSkipFrames: standAloneCallerSkipFrames}, }, - nil, + os.Stdout, ) // set global Zerolog logger diff --git a/nsqd.go b/nsqd.go index 965313b..1fabf30 100644 --- a/nsqd.go +++ b/nsqd.go @@ -5,15 +5,13 @@ import ( ) type NSQLogger struct { - logger zerolog.Logger - level zerolog.Level + level zerolog.Level } func NewNSQLogger(logLevel string) NSQLogger { - l := Logger() lvl, _ := zerolog.ParseLevel(logLevel) - return NSQLogger{logger: l, level: lvl} + return NSQLogger{level: lvl} } func (nl NSQLogger) Output(calldepth int, s string) error { @@ -21,3 +19,30 @@ func (nl NSQLogger) Output(calldepth int, s string) error { return nil } + +func (nl NSQLogger) LogLevel() int { + return nsqLogLvlFromZerologLogLvl(nl.level) +} + +func nsqLogLvlFromZerologLogLvl(level zerolog.Level) int { + var nsqlLL int + + switch level { + case zerolog.TraceLevel: + case zerolog.DebugLevel: + nsqlLL = 0 + case zerolog.InfoLevel: + nsqlLL = 1 + case zerolog.WarnLevel: + nsqlLL = 2 + case zerolog.ErrorLevel: + case zerolog.FatalLevel: + case zerolog.PanicLevel: + nsqlLL = 3 + case zerolog.NoLevel: + case zerolog.Disabled: + nsqlLL = 4 + } + + return nsqlLL +}