From fbc90e038c5411793397c25f0af1dfdee22ec59f Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Mon, 1 Feb 2016 17:49:37 +1300 Subject: [PATCH] prevent needless cpu burning in unused levels. fix #3898 --- pkg/log/log.go | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkg/log/log.go b/pkg/log/log.go index ff473be9e2d..6855f512d96 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -190,9 +190,6 @@ func (l *Logger) DelLogger(adapter string) error { } func (l *Logger) writerMsg(skip int, level LogLevel, msg string) error { - if l.level > level { - return nil - } lm := &logMsg{ skip: skip, level: level, @@ -267,36 +264,57 @@ func (l *Logger) Close() { } func (l *Logger) Trace(format string, v ...interface{}) { + if l.level > TRACE { + return + } msg := fmt.Sprintf("[T] "+format, v...) l.writerMsg(0, TRACE, msg) } func (l *Logger) Debug(format string, v ...interface{}) { + if l.level > DEBUG { + return + } msg := fmt.Sprintf("[D] "+format, v...) l.writerMsg(0, DEBUG, msg) } func (l *Logger) Info(format string, v ...interface{}) { + if l.level > INFO { + return + } msg := fmt.Sprintf("[I] "+format, v...) l.writerMsg(0, INFO, msg) } func (l *Logger) Warn(format string, v ...interface{}) { + if l.level > WARN { + return + } msg := fmt.Sprintf("[W] "+format, v...) l.writerMsg(0, WARN, msg) } func (l *Logger) Error(skip int, format string, v ...interface{}) { + if l.level > ERROR { + return + } msg := fmt.Sprintf("[E] "+format, v...) l.writerMsg(skip, ERROR, msg) } func (l *Logger) Critical(skip int, format string, v ...interface{}) { + if l.level > CRITICAL { + return + } msg := fmt.Sprintf("[C] "+format, v...) l.writerMsg(skip, CRITICAL, msg) } func (l *Logger) Fatal(skip int, format string, v ...interface{}) { + if l.level > FATAL { + return + } msg := fmt.Sprintf("[F] "+format, v...) l.writerMsg(skip, FATAL, msg) l.Close()