refactor config reader - also looks in additional search paths for config file unless NONE is specified

5 files changed, 15 insertions, 22 deletions

diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go
index d5dfba4..43549b3 100644
--- a/cmd/dcat/main.go
+++ b/cmd/dcat/main.go
@@ -26,10 +26,11 @@ func main() {
 	flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
 	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Trust all unknown host keys")
 	flag.BoolVar(&displayVersion, "version", false, "Display version")
-	flag.IntVar(&args.ConnectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
-	flag.IntVar(&args.SSHPort, "port", 2222, "SSH server port")
+	flag.IntVar(&args.ConnectionsPerCPU, "cpc", config.DefaultConnectionsPerCPU, "How many connections established per CPU core concurrently")
+	flag.IntVar(&args.SSHPort, "port", config.DefaultSSHPort, "SSH server port")
 	flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path")
 	flag.StringVar(&args.Discovery, "discovery", "", "Server discovery method")
+	flag.StringVar(&args.LogDir, "logDir", "", "Log dir")
 	flag.StringVar(&args.LogLevel, "logLevel", "", "Log level")
 	flag.StringVar(&args.PrivateKeyPathFile, "key", "", "Path to private key")
 	flag.StringVar(&args.ServersStr, "servers", "", "Remote servers to connect")
diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go
index c6bece0..36efe4e 100644
--- a/cmd/dgrep/main.go
+++ b/cmd/dgrep/main.go
@@ -28,10 +28,11 @@ func main() {
 	flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
 	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Trust all unknown host keys")
 	flag.BoolVar(&displayVersion, "version", false, "Display version")
-	flag.IntVar(&args.ConnectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
-	flag.IntVar(&args.SSHPort, "port", 2222, "SSH server port")
+	flag.IntVar(&args.ConnectionsPerCPU, "cpc", config.DefaultConnectionsPerCPU, "How many connections established per CPU core concurrently")
+	flag.IntVar(&args.SSHPort, "port", config.DefaultSSHPort, "SSH server port")
 	flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path")
 	flag.StringVar(&args.Discovery, "discovery", "", "Server discovery method")
+	flag.StringVar(&args.LogDir, "logDir", "", "Log dir")
 	flag.StringVar(&args.LogLevel, "logLevel", "", "Log level")
 	flag.StringVar(&args.PrivateKeyPathFile, "key", "", "Path to private key")
 	flag.StringVar(&args.RegexStr, "regex", ".", "Regular expression")
diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go
index 061d859..b895964 100644
--- a/cmd/dmap/main.go
+++ b/cmd/dmap/main.go
@@ -31,13 +31,12 @@ func main() {
 	flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
 	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Trust all unknown host keys")
 	flag.BoolVar(&displayVersion, "version", false, "Display version")
-	// TODO: Make ConnectionsPerCPU default value as a constant in config package.
-	flag.IntVar(&args.ConnectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
-	// TODO: make default ssh port a constant in the config package.
-	flag.IntVar(&args.SSHPort, "port", 2222, "SSH server port")
+	flag.IntVar(&args.ConnectionsPerCPU, "cpc", config.DefaultConnectionsPerCPU, "How many connections established per CPU core concurrently")
+	flag.IntVar(&args.SSHPort, "port", config.DefaultSSHPort, "SSH server port")
 	flag.IntVar(&args.Timeout, "timeout", 0, "Max time dtail server will collect data until disconnection")
 	flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path")
 	flag.StringVar(&args.Discovery, "discovery", "", "Server discovery method")
+	flag.StringVar(&args.LogDir, "logDir", "", "Log dir")
 	flag.StringVar(&args.LogLevel, "logLevel", "", "Log level")
 	flag.StringVar(&args.PrivateKeyPathFile, "key", "", "Path to private key")
 	flag.StringVar(&args.ServersStr, "servers", "", "Remote servers to connect")
diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go
index 5788a87..a3add5b 100644
--- a/cmd/dserver/main.go
+++ b/cmd/dserver/main.go
@@ -25,7 +25,6 @@ func main() {
 	var args config.Args
 	var color bool
 	var displayVersion bool
-	var logDir string
 	var pprof int
 	var shutdownAfter int
 
@@ -34,25 +33,18 @@ func main() {
 	flag.BoolVar(&color, "color", false, "Enable ANSII terminal colors")
 	flag.BoolVar(&config.ServerRelaxedAuthEnable, "relaxedAuth", false, "Enable relaxced SSH auth mode (don't use in production!)")
 	flag.BoolVar(&displayVersion, "version", false, "Display version")
-	flag.IntVar(&args.SSHPort, "port", 2222, "SSH server port")
+	flag.IntVar(&args.SSHPort, "port", config.DefaultSSHPort, "SSH server port")
 	flag.IntVar(&pprof, "pprof", -1, "Start PProf server this port")
 	flag.IntVar(&shutdownAfter, "shutdownAfter", 0, "Shutdown after so many seconds")
 	flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path")
+	flag.StringVar(&args.LogDir, "logDir", "", "Log dir")
 	flag.StringVar(&args.LogLevel, "logLevel", "", "Log level")
-	flag.StringVar(&logDir, "logDir", "", "Log dir path")
+	flag.StringVar(&args.LogDir, "logDir", "", "Log dir path")
 
 	flag.Parse()
 	args.NoColor = !color
 	config.Setup(&args, flag.Args())
 
-	if logDir != "" {
-		// TODO: Re-Implement log strategy support.
-		config.Common.LogDir = logDir
-		if config.Common.LogStrategy == "" {
-			config.Common.LogStrategy = "daily"
-		}
-	}
-
 	if displayVersion {
 		version.PrintAndExit()
 	}
diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go
index dcf1fab..0794f96 100644
--- a/cmd/dtail/main.go
+++ b/cmd/dtail/main.go
@@ -40,18 +40,18 @@ func main() {
 	flag.BoolVar(&args.RegexInvert, "invert", false, "Invert regex")
 	flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
 	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Trust all unknown host keys")
-	// TODO: Check whether the health check still works.
 	flag.BoolVar(&checkHealth, "checkHealth", false, "Only check for server health")
 	flag.BoolVar(&displayColorTable, "colorTable", false, "Show color table")
 	flag.BoolVar(&displayWideColorTable, "wideColorTable", false, "Show a large color table")
 	flag.BoolVar(&displayVersion, "version", false, "Display version")
-	flag.IntVar(&args.ConnectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
-	flag.IntVar(&args.SSHPort, "port", 2222, "SSH server port")
+	flag.IntVar(&args.ConnectionsPerCPU, "cpc", config.DefaultConnectionsPerCPU, "How many connections established per CPU core concurrently")
+	flag.IntVar(&args.SSHPort, "port", config.DefaultSSHPort, "SSH server port")
 	flag.IntVar(&args.Timeout, "timeout", 0, "Max time dtail server will collect data until disconnection")
 	flag.IntVar(&pprof, "pprof", -1, "Start PProf server this port")
 	flag.IntVar(&shutdownAfter, "shutdownAfter", 3600*24, "Shutdown after so many seconds")
 	flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path")
 	flag.StringVar(&args.Discovery, "discovery", "", "Server discovery method")
+	flag.StringVar(&args.LogDir, "logDir", "", "Log dir")
 	flag.StringVar(&args.LogLevel, "logLevel", "", "Log level")
 	flag.StringVar(&args.PrivateKeyPathFile, "key", "", "Path to private key")
 	flag.StringVar(&args.RegexStr, "regex", ".", "Regular expression")