Set default logfile path for dfdaemon/dfget

Signed-off-by: YanzheL <[email protected]>
dragonflyoss · Jan 14, 2020 · c02b0b0 · c02b0b0
1 parent ebfc638
commit c02b0b0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/cmd/dfdaemon/app/init.go b/cmd/dfdaemon/app/init.go
@@ -79,7 +79,9 @@ func initLogger(cfg config.Properties) error {
 		}
 		cfg.WorkHome = filepath.Join(current.HomeDir, ".small-dragonfly")
 	}
-
+	if cfg.LogConfig.Path == "" {
+		cfg.LogConfig.Path = filepath.Join(cfg.WorkHome, "logs", "dfdaemon.log")
+	}
 	opts := []dflog.Option{
 		dflog.WithLogFile(cfg.LogConfig.Path, cfg.LogConfig.MaxSize, cfg.LogConfig.MaxBackups),
 		dflog.WithSign(fmt.Sprintf("%d", os.Getpid())),

diff --git a/cmd/dfget/app/root.go b/cmd/dfget/app/root.go
@@ -188,10 +188,12 @@ func initProperties() ([]*propertiesResult, error) {
 // while console log will output the dfget client's log in console/terminal for
 // debugging usage.
 func initClientLog() error {
-	logFilePath := filepath.Join(cfg.WorkHome, "logs", "dfclient.log")
+	if cfg.LogConfig.Path == "" {
+		cfg.LogConfig.Path = filepath.Join(cfg.WorkHome, "logs", "dfclient.log")
+	}
 
 	opts := []dflog.Option{
-		dflog.WithLogFile(logFilePath, cfg.LogConfig.MaxSize, cfg.LogConfig.MaxBackups),
+		dflog.WithLogFile(cfg.LogConfig.Path, cfg.LogConfig.MaxSize, cfg.LogConfig.MaxBackups),
 		dflog.WithSign(cfg.Sign),
 		dflog.WithDebug(cfg.Verbose),
 	}

diff --git a/cmd/dfget/app/server.go b/cmd/dfget/app/server.go
@@ -82,10 +82,11 @@ func runServer() error {
 }
 
 func initServerLog() error {
-	logFilePath := filepath.Join(cfg.WorkHome, "logs", "dfserver.log")
-
+	if cfg.LogConfig.Path == "" {
+		cfg.LogConfig.Path = filepath.Join(cfg.WorkHome, "logs", "dfserver.log")
+	}
 	opts := []dflog.Option{
-		dflog.WithLogFile(logFilePath, cfg.LogConfig.MaxSize, cfg.LogConfig.MaxBackups),
+		dflog.WithLogFile(cfg.LogConfig.Path, cfg.LogConfig.MaxSize, cfg.LogConfig.MaxBackups),
 		dflog.WithSign(cfg.Sign),
 		dflog.WithDebug(cfg.Verbose),
 	}