improve: fixbug stdout

master v0.1.15
infra-bot 4 years ago
parent 76f22a496b
commit 237ffbca4a
  1. 13
      gokit.go

@ -26,7 +26,7 @@ var (
alsoStdout bool alsoStdout bool
withCaller Caller withCaller Caller
stdOut io.Writer stdOut io.Writer
levelToNames = map[Level]string{ levelToNames = map[Level]string{
LevelFatal: "FATAL", LevelFatal: "FATAL",
LevelError: "ERROR", LevelError: "ERROR",
LevelWarn: "WARN", LevelWarn: "WARN",
@ -155,7 +155,7 @@ type Writer interface {
Close() error Close() error
} }
func GetWriter()( io.Writer, error) { func GetWriter() (io.Writer, error) {
if logWriter == nil { if logWriter == nil {
return nil, fmt.Errorf("logkit not inited") return nil, fmt.Errorf("logkit not inited")
} }
@ -186,7 +186,7 @@ func SetDebug(debug bool) {
if debug { if debug {
alsoStdout = true alsoStdout = true
withCaller = BasePathFunc withCaller = BasePathFunc
logLevel = LevelDebug logLevel = LevelDebug
} }
} }
@ -213,6 +213,13 @@ func Init() (writer io.Writer, err error) {
if logWriter == nil && channel == STDOUT { if logWriter == nil && channel == STDOUT {
logWriter = os.Stdout logWriter = os.Stdout
} }
if alsoStdout {
if channel == STDOUT {
stdOut = logWriter
} else {
stdOut = os.Stdout
}
}
inited = true inited = true
return logWriter, nil return logWriter, nil
} }

Loading…
Cancel
Save