Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pkg/logutil: wrap InitLogger in sync.Once for thread-safety #753

Merged
merged 2 commits into from Sep 15, 2017
Merged

pkg/logutil: wrap InitLogger in sync.Once for thread-safety #753

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b087991
pkg/logutil: wrap InitLogger in sync.Once for thread-safety
tiancaiamao Sep 14, 2017
70859dc
Merge branch 'master' into tiancaiamao/log-init-once
disksing Sep 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 18 additions & 13 deletions pkg/logutil/log.go
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@ import (
"path"
"runtime"
"strings"
"sync"

log "github.com/Sirupsen/logrus"
"github.com/coreos/pkg/capnslog"
Expand Down Expand Up @@ -214,27 +215,31 @@ func InitFileLog(cfg *FileLogConfig) error {
return nil
}

var once sync.Once

// InitLogger initalizes PD's logger.
func InitLogger(cfg *LogConfig) error {
log.SetLevel(stringToLogLevel(cfg.Level))
log.AddHook(&contextHook{})
var err error
once.Do(func() {
log.SetLevel(stringToLogLevel(cfg.Level))
log.AddHook(&contextHook{})

if cfg.Format == "" {
cfg.Format = defaultLogFormat
}
log.SetFormatter(stringToLogFormatter(cfg.Format, cfg.DisableTimestamp))
if cfg.Format == "" {
cfg.Format = defaultLogFormat
}
log.SetFormatter(stringToLogFormatter(cfg.Format, cfg.DisableTimestamp))

// etcd log
capnslog.SetFormatter(&redirectFormatter{})
// etcd log
capnslog.SetFormatter(&redirectFormatter{})

if len(cfg.File.Filename) == 0 {
return nil
}
if len(cfg.File.Filename) == 0 {
return
}

err := InitFileLog(&cfg.File)
err = InitFileLog(&cfg.File)
})
if err != nil {
return errors.Trace(err)
}

return nil
}