GitHub-Mirror/sched
2
0
Fork 0
mirror of https://github.com/Fishwaldo/sched.git synced 2025-07-06 21:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: make the LruLogger private, and either a Default Logrus logger, or pass in a existing logger

Browse source
This commit is contained in:
Justin Hammond 2021-04-20 08:01:27 +08:00
parent d4131b3b78
commit 7adc9ad6d4
2 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/schedule-logs/main.go
View file

@ -41,7 +41,7 @@ func main() {
} }
// Create Schedule // Create Schedule
scheduler := sched.NewScheduler(sched.WithLogger(sched.LogrusLogger()), scheduler := sched.NewScheduler(sched.WithLogger(sched.LogrusDefaultLogger()),
sched.WithConsoleMetrics(1*time.Minute)) sched.WithConsoleMetrics(1*time.Minute))
_ = scheduler.Add("cronEveryMinute", cronTimer, job("every-minute-cron")) _ = scheduler.Add("cronEveryMinute", cronTimer, job("every-minute-cron"))

34
logrus.go
View file

@ -4,11 +4,11 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
type LruLogger struct { type lruLogger struct {
jl *logrus.Entry jl *logrus.Entry
} }
func (l *LruLogger) Debugw(msg string, keysAndValues ...interface{}) { func (l *lruLogger) Debugw(msg string, keysAndValues ...interface{}) {
logger := l.jl logger := l.jl
for i := 0; i < len(keysAndValues); i++ { for i := 0; i < len(keysAndValues); i++ {
if i%2 == 0 { if i%2 == 0 {
@ -17,7 +17,7 @@ func (l *LruLogger) Debugw(msg string, keysAndValues ...interface{}) {
} }
logger.Debug(msg) logger.Debug(msg)
} }
func (l LruLogger) Errorw(msg string, keysAndValues ...interface{}) { func (l lruLogger) Errorw(msg string, keysAndValues ...interface{}) {
logger := l.jl logger := l.jl
for i := 0; i < len(keysAndValues); i++ { for i := 0; i < len(keysAndValues); i++ {
if i%2 == 0 { if i%2 == 0 {
@ -26,7 +26,7 @@ func (l LruLogger) Errorw(msg string, keysAndValues ...interface{}) {
} }
logger.Error(msg) logger.Error(msg)
} }
func (l LruLogger) Fatalw(msg string, keysAndValues ...interface{}) { func (l lruLogger) Fatalw(msg string, keysAndValues ...interface{}) {
logger := l.jl logger := l.jl
for i := 0; i < len(keysAndValues); i++ { for i := 0; i < len(keysAndValues); i++ {
if i%2 == 0 { if i%2 == 0 {
@ -35,7 +35,7 @@ func (l LruLogger) Fatalw(msg string, keysAndValues ...interface{}) {
} }
logger.Fatal(msg) logger.Fatal(msg)
} }
func (l LruLogger) Infow(msg string, keysAndValues ...interface{}) { func (l lruLogger) Infow(msg string, keysAndValues ...interface{}) {
logger := l.jl logger := l.jl
for i := 0; i < len(keysAndValues); i++ { for i := 0; i < len(keysAndValues); i++ {
if i%2 == 0 { if i%2 == 0 {
@ -44,7 +44,7 @@ func (l LruLogger) Infow(msg string, keysAndValues ...interface{}) {
} }
logger.Info(msg) logger.Info(msg)
} }
func (l LruLogger) Panicw(msg string, keysAndValues ...interface{}) { func (l lruLogger) Panicw(msg string, keysAndValues ...interface{}) {
logger := l.jl logger := l.jl
for i := 0; i < len(keysAndValues); i++ { for i := 0; i < len(keysAndValues); i++ {
if i%2 == 0 { if i%2 == 0 {
@ -53,7 +53,7 @@ func (l LruLogger) Panicw(msg string, keysAndValues ...interface{}) {
} }
logger.Panic(msg) logger.Panic(msg)
} }
func (l LruLogger) Warnw(msg string, keysAndValues ...interface{}) { func (l lruLogger) Warnw(msg string, keysAndValues ...interface{}) {
logger := l.jl logger := l.jl
for i := 0; i < len(keysAndValues); i++ { for i := 0; i < len(keysAndValues); i++ {
if i%2 == 0 { if i%2 == 0 {
@ -62,7 +62,7 @@ func (l LruLogger) Warnw(msg string, keysAndValues ...interface{}) {
} }
logger.Warn(msg) logger.Warn(msg)
} }
func (l *LruLogger) With(args ...interface{}) Logger { func (l *lruLogger) With(args ...interface{}) Logger {
for i := 0; i < len(args); i++ { for i := 0; i < len(args); i++ {
if i%2 == 0 { if i%2 == 0 {
l.jl = l.jl.WithField(args[i].(string), args[i+1]) l.jl = l.jl.WithField(args[i].(string), args[i+1])
@ -70,16 +70,22 @@ func (l *LruLogger) With(args ...interface{}) Logger {
} }
return l return l
} }
func (l LruLogger) Named(name string) Logger { func (l lruLogger) Named(name string) Logger {
logger := l.jl.WithField("From", name) logger := l.jl.WithField("From", name)
return &LruLogger{jl: logger} return &lruLogger{jl: logger}
} }
func (l *LruLogger) Sync() error { func (l *lruLogger) Sync() error {
return nil return nil
} }
//LogrusLogger Return logger Sched Logger based on logrus //LogrusDefaultLogger Return Logger based on logrus with new instance
func LogrusLogger() Logger { func LogrusDefaultLogger() Logger {
// TODO control verbosity // TODO control verbosity
return &LruLogger{jl: logrus.NewEntry(logrus.New())} return &lruLogger{jl: logrus.NewEntry(logrus.New())}
}
//LogrusLogger Return Return Logger based on logrus with existing instance
func LogrusLogger(log *logrus.Logger) Logger {
// TODO control verbosity
return &lruLogger{jl: logrus.NewEntry(log)}
} }