Skip to content

Commit

Permalink
Some minor correction for logger, fasthttp and nsq logging implementa…
Browse files Browse the repository at this point in the history
…tion
  • Loading branch information
smgladkovskiy committed Jan 26, 2021
1 parent a1103ed commit 9680bee
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 6 deletions.
2 changes: 1 addition & 1 deletion fasthttp.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ package log
type FHLogger struct{}

func (fhl FHLogger) Printf(format string, v ...interface{}) {
logger.Printf(format, v...)
Printf(format, v...)
}
2 changes: 1 addition & 1 deletion logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var logger, _ = newZerolog(
Format: FormatText,
Caller: &CallerConfig{CallerSkipFrames: standAloneCallerSkipFrames},
},
nil,
os.Stdout,
)

// set global Zerolog logger
Expand Down
33 changes: 29 additions & 4 deletions nsqd.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,44 @@ 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 {
WithLevel(nl.level).Msg(s)

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
}

0 comments on commit 9680bee

Please sign in to comment.