提交 e8d2d61c 编写于 作者: R Robert Swain

cmd: common/log: Always configure logging

When LOG_DIR or so is not specified, just configure the formatter.
上级 80100830
......@@ -20,10 +20,7 @@ func main() {
if bindAddr == "" {
log.Panic("No BIND_ADDRESS environment variable found.")
}
logDir := os.Getenv("LOG_DIR")
if logDir != "" {
common.SetupLogging(logDir)
}
common.SetupLogging(os.Getenv("LOG_DIR"))
// TODO: Rather than generating a new key on every startup, we should be
// reading a PEM formatted file instead.
......
......@@ -47,10 +47,7 @@ func main() {
if *bindAddr == "" {
log.Fatal("--listen must be supplied")
}
logDir := os.Getenv("LOG_DIR")
if logDir != "" {
common.SetupLogging(logDir)
}
common.SetupLogging(os.Getenv("LOG_DIR"))
log.Info("sync server config: ", cfg)
......
......@@ -10,16 +10,22 @@ import (
// SetupLogging configures the logging format and destination(s).
func SetupLogging(logDir string) {
_ = os.Mkdir(logDir, os.ModePerm)
logrus.AddHook(dugong.NewFSHook(
filepath.Join(logDir, "info.log"),
filepath.Join(logDir, "warn.log"),
filepath.Join(logDir, "error.log"),
&logrus.TextFormatter{
TimestampFormat: "2006-01-02 15:04:05.000000",
DisableColors: true,
DisableTimestamp: false,
DisableSorting: false,
}, &dugong.DailyRotationSchedule{GZip: true},
))
formatter := &logrus.TextFormatter{
TimestampFormat: "2006-01-02 15:04:05.000000",
DisableColors: true,
DisableTimestamp: false,
DisableSorting: false,
}
if logDir != "" {
_ = os.Mkdir(logDir, os.ModePerm)
logrus.AddHook(dugong.NewFSHook(
filepath.Join(logDir, "info.log"),
filepath.Join(logDir, "warn.log"),
filepath.Join(logDir, "error.log"),
formatter,
&dugong.DailyRotationSchedule{GZip: true},
))
} else {
logrus.SetFormatter(formatter)
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册