From e66407395d6a9f7aaf039cfb59dd5738ca08250a Mon Sep 17 00:00:00 2001 From: guohao Date: Thu, 8 Aug 2019 16:52:52 +0800 Subject: [PATCH] add caller info & stdout --- gokit.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gokit.go b/gokit.go index f1426b0..47c6f89 100644 --- a/gokit.go +++ b/gokit.go @@ -73,7 +73,6 @@ func Init(_channel Channel, name string, level Level, _alsoStdout bool, _withCal } logLevel = level - logLevelName = getLevelName(level) channel = _channel alsoStdout = _alsoStdout withCaller = _withCaller @@ -88,12 +87,12 @@ func getLevelName(level Level) string { return levelName } -func format(msg string) string { +func format(level Level, msg string) string { if withCaller { _, file, line, _ := runtime.Caller(3) - return fmt.Sprintf("%s [%s] %s:%d %s \n", time.Now().Format("2006-01-02 15:04:05.999"), logLevelName, file, line, msg) + return fmt.Sprintf("%s [%s] %s:%d %s \n", time.Now().Format("2006-01-02 15:04:05.999"), getLevelName(level), file, line, msg) } else { - return fmt.Sprintf("%s [%s] %s \n", time.Now().Format("2006-01-02 15:04:05.999"), logLevelName, msg) + return fmt.Sprintf("%s [%s] %s \n", time.Now().Format("2006-01-02 15:04:05.999"), getLevelName(level), msg) } } @@ -110,7 +109,7 @@ func write(level Level, msg string) { } inited = true } - messageStr := format(msg) + messageStr := format(level, msg) logWriter.Write(level, messageStr) if alsoStdout { fmt.Println(messageStr)