improve: pass logger instead of using global logger
This commit is contained in:
@@ -10,9 +10,13 @@ import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
var Logger *log.Logger
|
||||
|
||||
func initLog() {
|
||||
Logger = log.New()
|
||||
|
||||
if Settings.Log.DebugLevel {
|
||||
log.SetLevel(log.DebugLevel)
|
||||
Logger.SetLevel(log.DebugLevel)
|
||||
}
|
||||
|
||||
if Settings.Log.WriteFile {
|
||||
@@ -22,7 +26,7 @@ func initLog() {
|
||||
}
|
||||
err := os.MkdirAll(Settings.Log.FilePath, os.ModePerm)
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
Logger.Fatalln(err)
|
||||
}
|
||||
|
||||
if Settings.Log.FileName == "" {
|
||||
@@ -31,15 +35,15 @@ func initLog() {
|
||||
|
||||
f, err := os.OpenFile(Settings.Log.FilePath+Settings.Log.FileName, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
Logger.Fatalln(err)
|
||||
}
|
||||
|
||||
//设置双重输出
|
||||
mw := io.MultiWriter(os.Stdout, f)
|
||||
log.SetOutput(mw)
|
||||
Logger.SetOutput(mw)
|
||||
|
||||
//设置输出格式
|
||||
log.SetFormatter(&nested.Formatter{
|
||||
Logger.SetFormatter(&nested.Formatter{
|
||||
HideKeys: true,
|
||||
NoColors: Settings.Log.WriteFile,
|
||||
TimestampFormat: "2006-01-02 15:04:05",
|
||||
|
||||
Reference in New Issue
Block a user