Client default log dir is ~/log

5 files changed, 14 insertions, 9 deletions

diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go
index 43549b3..21946f6 100644
--- a/cmd/dcat/main.go
+++ b/cmd/dcat/main.go
@@ -10,6 +10,7 @@ import (
 	"github.com/mimecast/dtail/internal/config"
 	"github.com/mimecast/dtail/internal/io/dlog"
 	"github.com/mimecast/dtail/internal/io/signal"
+	"github.com/mimecast/dtail/internal/source"
 	"github.com/mimecast/dtail/internal/user"
 	"github.com/mimecast/dtail/internal/version"
 )
@@ -30,7 +31,7 @@ func main() {
 	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.LogDir, "logDir", "~/log", "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")
@@ -50,7 +51,7 @@ func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 	var wg sync.WaitGroup
 	wg.Add(1)
-	dlog.Start(ctx, &wg, dlog.CLIENT, config.Common.LogLevel)
+	dlog.Start(ctx, &wg, source.Client, config.Common.LogLevel)
 
 	client, err := clients.NewCatClient(args)
 	if err != nil {
diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go
index 36efe4e..4f21a9e 100644
--- a/cmd/dgrep/main.go
+++ b/cmd/dgrep/main.go
@@ -10,6 +10,7 @@ import (
 	"github.com/mimecast/dtail/internal/config"
 	"github.com/mimecast/dtail/internal/io/dlog"
 	"github.com/mimecast/dtail/internal/io/signal"
+	"github.com/mimecast/dtail/internal/source"
 	"github.com/mimecast/dtail/internal/user"
 	"github.com/mimecast/dtail/internal/version"
 )
@@ -32,7 +33,7 @@ func main() {
 	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.LogDir, "logDir", "~/log", "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")
@@ -54,7 +55,7 @@ func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 	var wg sync.WaitGroup
 	wg.Add(1)
-	dlog.Start(ctx, &wg, dlog.CLIENT, args.LogLevel)
+	dlog.Start(ctx, &wg, source.Client, args.LogLevel)
 
 	if grep != "" {
 		args.RegexStr = grep
diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go
index b895964..cc8a158 100644
--- a/cmd/dmap/main.go
+++ b/cmd/dmap/main.go
@@ -11,6 +11,7 @@ import (
 	"github.com/mimecast/dtail/internal/io/dlog"
 	"github.com/mimecast/dtail/internal/io/signal"
 	"github.com/mimecast/dtail/internal/omode"
+	"github.com/mimecast/dtail/internal/source"
 	"github.com/mimecast/dtail/internal/user"
 	"github.com/mimecast/dtail/internal/version"
 )
@@ -36,7 +37,7 @@ func main() {
 	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.LogDir, "logDir", "~/log", "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")
@@ -57,7 +58,7 @@ func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 	var wg sync.WaitGroup
 	wg.Add(1)
-	dlog.Start(ctx, &wg, dlog.CLIENT, config.Common.LogLevel)
+	dlog.Start(ctx, &wg, source.Client, config.Common.LogLevel)
 
 	client, err := clients.NewMaprClient(args, queryStr, clients.DefaultMode)
 	if err != nil {
diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go
index e77bc21..a44d577 100644
--- a/cmd/dserver/main.go
+++ b/cmd/dserver/main.go
@@ -16,6 +16,7 @@ import (
 	"github.com/mimecast/dtail/internal/config"
 	"github.com/mimecast/dtail/internal/io/dlog"
 	"github.com/mimecast/dtail/internal/server"
+	"github.com/mimecast/dtail/internal/source"
 	"github.com/mimecast/dtail/internal/user"
 	"github.com/mimecast/dtail/internal/version"
 )
@@ -67,7 +68,7 @@ func main() {
 
 	var wg sync.WaitGroup
 	wg.Add(1)
-	dlog.Start(ctx, &wg, dlog.SERVER, config.Common.LogLevel)
+	dlog.Start(ctx, &wg, source.Server, config.Common.LogLevel)
 
 	if config.ServerRelaxedAuthEnable {
 		dlog.Server.Fatal("SSH relaxed-auth mode enabled")
diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go
index 0794f96..95a0427 100644
--- a/cmd/dtail/main.go
+++ b/cmd/dtail/main.go
@@ -17,6 +17,7 @@ import (
 	"github.com/mimecast/dtail/internal/io/dlog"
 	"github.com/mimecast/dtail/internal/io/signal"
 	"github.com/mimecast/dtail/internal/omode"
+	"github.com/mimecast/dtail/internal/source"
 	"github.com/mimecast/dtail/internal/user"
 	"github.com/mimecast/dtail/internal/version"
 )
@@ -51,7 +52,7 @@ func main() {
 	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.LogDir, "logDir", "~/log", "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")
@@ -95,7 +96,7 @@ func main() {
 
 	var wg sync.WaitGroup
 	wg.Add(1)
-	dlog.Start(ctx, &wg, dlog.CLIENT, config.Common.LogLevel)
+	dlog.Start(ctx, &wg, source.Client, config.Common.LogLevel)
 
 	if pprof > -1 {
 		// For debugging purposes only