From 237ffbca4a4f517397353ee88e899ffd819475bb Mon Sep 17 00:00:00 2001 From: infra-bot Date: Wed, 22 Jul 2020 11:13:05 +0800 Subject: [PATCH] improve: fixbug stdout --- gokit.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gokit.go b/gokit.go index 141f7dc..4d76bd2 100644 --- a/gokit.go +++ b/gokit.go @@ -26,7 +26,7 @@ var ( alsoStdout bool withCaller Caller stdOut io.Writer - levelToNames = map[Level]string{ + levelToNames = map[Level]string{ LevelFatal: "FATAL", LevelError: "ERROR", LevelWarn: "WARN", @@ -155,7 +155,7 @@ type Writer interface { Close() error } -func GetWriter()( io.Writer, error) { +func GetWriter() (io.Writer, error) { if logWriter == nil { return nil, fmt.Errorf("logkit not inited") } @@ -186,7 +186,7 @@ func SetDebug(debug bool) { if debug { alsoStdout = true withCaller = BasePathFunc - logLevel = LevelDebug + logLevel = LevelDebug } } @@ -213,6 +213,13 @@ func Init() (writer io.Writer, err error) { if logWriter == nil && channel == STDOUT { logWriter = os.Stdout } + if alsoStdout { + if channel == STDOUT { + stdOut = logWriter + } else { + stdOut = os.Stdout + } + } inited = true return logWriter, nil }