From 17dbeb3e88687d6bf170bcc11ddf130b8d25a79c Mon Sep 17 00:00:00 2001 From: Lukas Matt Date: Wed, 29 Nov 2017 02:20:46 +0100 Subject: [PATCH] Clean-up logger for new revel log interface --- logger.go | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/logger.go b/logger.go index fd8b3ad..dc01697 100644 --- a/logger.go +++ b/logger.go @@ -32,8 +32,7 @@ const ( ) var ( - logger Log - defaultLogger Logger + logger Logger defaultPrefix string ) @@ -49,29 +48,29 @@ func init() { } defaultPrefix = fmt.Sprintf("%s:%d %s ", file, line, f.Name()) - defaultLogger = log.New(os.Stdout, defaultPrefix, log.Lshortfile) + logger = Logger{log.New(os.Stdout, defaultPrefix, log.Lshortfile)} } -type Logger interface { +type LogWriter interface { Println(v... interface{}) } -type Log struct{ - Logger +type Logger struct{ + LogWriter } -func SetLogger(logger Logger) { - defaultLogger = logger +func SetLogger(writer LogWriter) { + logger = Logger{writer} } -func (l Log) Info(values... interface{}) { - defaultLogger.Println(values...) +func (l Logger) Info(values... interface{}) { + l.Println(values...) } -func (l Log) Error(values... interface{}) { +func (l Logger) Error(values... interface{}) { l.Info(LOG_C_RED, values, LOG_C_RESET) } -func (l Log) Warn(values... interface{}) { +func (l Logger) Warn(values... interface{}) { l.Info(LOG_C_YELLOW, values, LOG_C_RESET) } -- GitLab