Merge pull request #1145 from YanzheL/configurable-logfile-path

Configure dfclient/dfdaemon/dfget log file path via 'logConfig.path' property

cmd/dfdaemon/app/init.go

@@ -79,16 +79,16 @@ func initLogger(cfg config.Properties) error {
 		}
 		cfg.WorkHome = filepath.Join(current.HomeDir, ".small-dragonfly")
 	}
-
-	logFilePath := filepath.Join(cfg.WorkHome, "logs", "dfdaemon.log")
-
+	if cfg.LogConfig.Path == "" {
+		cfg.LogConfig.Path = filepath.Join(cfg.WorkHome, "logs", "dfdaemon.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(fmt.Sprintf("%d", os.Getpid())),
 		dflog.WithDebug(cfg.Verbose),
 	}
 
-	logrus.Debugf("use log file %s", logFilePath)
+	logrus.Debugf("use log file %s", cfg.LogConfig.Path)
 
 	return errors.Wrap(dflog.Init(logrus.StandardLogger(), opts...), "init log")
 }

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),
 	}

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),
 	}

docs/config/dfdaemon_config_template.yml

@@ -74,3 +74,8 @@ verbose: false
 
 # The maximum number of CPUs that the dfdaemon can use
 maxprocs: 10
+
+# Logging
+logConfig:
+   # Log file path
+   path: /dev/stdout

docs/config/dfdaemon_properties.md

@@ -10,6 +10,7 @@ The following startup parameters are supported for `dfdaemon`
 | ------------- | ------------- |
 | dfget_flags |	dfget properties |
 | dfpath | dfget bin path |
+| logConfig | Logging properties |
 | hijack_https | HijackHTTPS is the list of hosts whose https requests should be hijacked by dfdaemon. The first matched rule will be used |
 | localrepo | Temp output dir of dfdaemon, by default `$HOME/.small-dragonfly/dfdaemon/data/` |
 | proxies | Proxies is the list of rules for the transparent proxy |

pkg/dflog/log.go

@@ -35,6 +35,10 @@ type LogConfig struct {
 	// MaxBackups is the maximum number of old log files to retain.
 	// The default value is 1.
 	MaxBackups int `yaml:"maxBackups" json:"maxBackups"`
+
+	// Path is the location of log file
+	// The default value is logs/dfdaemon.log
+	Path string `yaml:"path" json:"path"`
 }
 
 // DefaultLogTimeFormat defines the timestamp format.