From 622490fbf3c659b10aafc0dfd953a85bf1d00d68 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Sat, 29 Aug 2020 17:43:06 +0300 Subject: [PATCH] logger: refactor interface Signed-off-by: Vasiliy Tolstov --- logger/default.go | 13 +++++++++---- logger/logger.go | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/logger/default.go b/logger/default.go index f51140ce..47c0ca56 100644 --- a/logger/default.go +++ b/logger/default.go @@ -39,6 +39,13 @@ func (l *defaultLogger) String() string { return "default" } +func (l *defaultLogger) V(level Level) bool { + if l.opts.Level.Enabled(level) { + return true + } + return false +} + func (l *defaultLogger) Fields(fields map[string]interface{}) Logger { l.Lock() l.opts.Fields = copyFields(fields) @@ -79,8 +86,7 @@ func logCallerfilePath(loggingFilePath string) string { } func (l *defaultLogger) Log(level Level, v ...interface{}) { - // TODO decide does we need to write message if log level not used? - if !l.opts.Level.Enabled(level) { + if !l.V(level) { return } @@ -118,8 +124,7 @@ func (l *defaultLogger) Log(level Level, v ...interface{}) { } func (l *defaultLogger) Logf(level Level, format string, v ...interface{}) { - // TODO decide does we need to write message if log level not used? - if level < l.opts.Level { + if !l.V(level) { return } diff --git a/logger/logger.go b/logger/logger.go index ad3b41a1..4af78358 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -10,6 +10,8 @@ var ( type Logger interface { // Init initialises options Init(options ...Option) error + // V compare provided verbosity level with current log level + V(level Level) bool // The Logger options Options() Options // Fields set fields to always be logged