refactor

6 files changed, 37 insertions, 16 deletions

diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go
index ee851ab..662a50d 100644
--- a/cmd/dcat/main.go
+++ b/cmd/dcat/main.go
@@ -39,6 +39,7 @@ func main() {
 	flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path")
 	flag.StringVar(&args.Discovery, "discovery", "", "Server discovery method")
 	flag.StringVar(&args.LogDir, "logDir", "~/log", "Log dir")
+	flag.StringVar(&args.Logger, "logger", config.DefaultClientLogger, "Logger name")
 	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")
@@ -58,7 +59,7 @@ func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 	var wg sync.WaitGroup
 	wg.Add(1)
-	dlog.Start(ctx, &wg, source.Client, config.Common.LogLevel)
+	dlog.Start(ctx, &wg, source.Client)
 
 	if pprof > -1 {
 		// For debugging purposes only
diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go
index 95db6f0..529331d 100644
--- a/cmd/dgrep/main.go
+++ b/cmd/dgrep/main.go
@@ -34,6 +34,7 @@ func main() {
 	flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path")
 	flag.StringVar(&args.Discovery, "discovery", "", "Server discovery method")
 	flag.StringVar(&args.LogDir, "logDir", "~/log", "Log dir")
+	flag.StringVar(&args.Logger, "logger", config.DefaultClientLogger, "Logger name")
 	flag.StringVar(&args.LogLevel, "logLevel", "", "Log level")
 	flag.StringVar(&args.PrivateKeyPathFile, "key", "", "Path to private key")
 	flag.StringVar(&args.RegexStr, "regex", ".", "Regular expression")
@@ -55,7 +56,7 @@ func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 	var wg sync.WaitGroup
 	wg.Add(1)
-	dlog.Start(ctx, &wg, source.Client, args.LogLevel)
+	dlog.Start(ctx, &wg, source.Client)
 
 	if grep != "" {
 		args.RegexStr = grep
diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go
index d32ccb0..acc1dc6 100644
--- a/cmd/dmap/main.go
+++ b/cmd/dmap/main.go
@@ -19,7 +19,6 @@ import (
 // The evil begins here.
 func main() {
 	var displayVersion bool
-	var queryStr string
 
 	args := config.Args{
 		Mode: omode.MapClient,
@@ -38,12 +37,13 @@ func main() {
 	flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path")
 	flag.StringVar(&args.Discovery, "discovery", "", "Server discovery method")
 	flag.StringVar(&args.LogDir, "logDir", "~/log", "Log dir")
+	flag.StringVar(&args.Logger, "logger", config.DefaultClientLogger, "Logger name")
 	flag.StringVar(&args.LogLevel, "logLevel", "", "Log level")
 	flag.StringVar(&args.PrivateKeyPathFile, "key", "", "Path to private key")
+	flag.StringVar(&args.QueryStr, "query", "", "Map reduce query")
 	flag.StringVar(&args.ServersStr, "servers", "", "Remote servers to connect")
 	flag.StringVar(&args.UserName, "user", userName, "Your system user name")
 	flag.StringVar(&args.What, "files", "", "File(s) to read")
-	flag.StringVar(&queryStr, "query", "", "Map reduce query")
 
 	flag.Parse()
 	config.Setup(source.Client, &args, flag.Args())
@@ -58,9 +58,9 @@ func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 	var wg sync.WaitGroup
 	wg.Add(1)
-	dlog.Start(ctx, &wg, source.Client, config.Common.LogLevel)
+	dlog.Start(ctx, &wg, source.Client)
 
-	client, err := clients.NewMaprClient(args, queryStr, clients.DefaultMode)
+	client, err := clients.NewMaprClient(args, clients.DefaultMode)
 	if err != nil {
 		dlog.Client.FatalPanic(err)
 	}
diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go
index c1db2f2..780c6d5 100644
--- a/cmd/dserver/main.go
+++ b/cmd/dserver/main.go
@@ -39,6 +39,7 @@ func main() {
 	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.Logger, "logger", config.DefaultServerLogger, "Logger name")
 	flag.StringVar(&args.LogLevel, "logLevel", "", "Log level")
 
 	flag.Parse()
@@ -68,7 +69,7 @@ func main() {
 
 	var wg sync.WaitGroup
 	wg.Add(1)
-	dlog.Start(ctx, &wg, source.Server, config.Common.LogLevel)
+	dlog.Start(ctx, &wg, source.Server)
 
 	if config.ServerRelaxedAuthEnable {
 		dlog.Server.Fatal("SSH relaxed-auth mode enabled")
diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go
index 301fc08..adfeaa5 100644
--- a/cmd/dtail/main.go
+++ b/cmd/dtail/main.go
@@ -31,7 +31,6 @@ func main() {
 	var displayVersion bool
 	var grep string
 	var pprof int
-	var queryStr string
 	var shutdownAfter int
 
 	userName := user.Name()
@@ -53,14 +52,15 @@ func main() {
 	flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path")
 	flag.StringVar(&args.Discovery, "discovery", "", "Server discovery method")
 	flag.StringVar(&args.LogDir, "logDir", "~/log", "Log dir")
+	flag.StringVar(&args.Logger, "logger", config.DefaultClientLogger, "Logger name")
 	flag.StringVar(&args.LogLevel, "logLevel", "", "Log level")
 	flag.StringVar(&args.PrivateKeyPathFile, "key", "", "Path to private key")
+	flag.StringVar(&args.QueryStr, "query", "", "Map reduce query")
 	flag.StringVar(&args.RegexStr, "regex", ".", "Regular expression")
 	flag.StringVar(&args.ServersStr, "servers", "", "Remote servers to connect")
 	flag.StringVar(&args.UserName, "user", userName, "Your system user name")
 	flag.StringVar(&args.What, "files", "", "File(s) to read")
 	flag.StringVar(&grep, "grep", "", "Alias for -regex")
-	flag.StringVar(&queryStr, "query", "", "Map reduce query")
 
 	flag.Parse()
 	if grep != "" {
@@ -71,15 +71,15 @@ func main() {
 		version.PrintAndExit()
 	}
 	if !args.Spartan {
-		if !checkHealth {
-			version.Print()
-		}
 		if displayWideColorTable {
 			color.TablePrintAndExit(true)
 		}
 		if displayColorTable {
 			color.TablePrintAndExit(false)
 		}
+		if !checkHealth {
+			version.Print()
+		}
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())
@@ -90,7 +90,7 @@ func main() {
 
 	var wg sync.WaitGroup
 	wg.Add(1)
-	dlog.Start(ctx, &wg, source.Client, config.Common.LogLevel)
+	dlog.Start(ctx, &wg, source.Client)
 
 	if checkHealth {
 		fmt.Println("WARN: DTail health check has moved to separate binary dtailhealtcheck - please adjust the monitoring scripts!")
@@ -109,13 +109,13 @@ func main() {
 	var err error
 	args.Mode = omode.TailClient
 
-	switch queryStr {
+	switch args.QueryStr {
 	case "":
 		if client, err = clients.NewTailClient(args); err != nil {
 			panic(err)
 		}
 	default:
-		if client, err = clients.NewMaprClient(args, queryStr, clients.DefaultMode); err != nil {
+		if client, err = clients.NewMaprClient(args, clients.DefaultMode); err != nil {
 			panic(err)
 		}
 	}
diff --git a/cmd/dtailhealthcheck/main.go b/cmd/dtailhealthcheck/main.go
index e0cb795..71c162e 100644
--- a/cmd/dtailhealthcheck/main.go
+++ b/cmd/dtailhealthcheck/main.go
@@ -3,9 +3,14 @@ package main
 import (
 	"context"
 	"flag"
+	"fmt"
 	"os"
 	"sync"
 
+	"net/http"
+	_ "net/http"
+	_ "net/http/pprof"
+
 	"github.com/mimecast/dtail/internal/clients"
 	"github.com/mimecast/dtail/internal/config"
 	"github.com/mimecast/dtail/internal/io/dlog"
@@ -16,8 +21,14 @@ import (
 // The evil begins here.
 func main() {
 	var args config.Args
+	var pprof int
+
+	flag.IntVar(&pprof, "pprof", -1, "Start PProf server this port")
+	flag.StringVar(&args.Logger, "logger", config.DefaultHealthCheckLogger, "Logger name")
+	flag.StringVar(&args.LogLevel, "logLevel", "", "Log level")
 	flag.StringVar(&args.ServersStr, "server", "", "Remote server to connect")
 	flag.Parse()
+
 	config.Setup(source.HealthCheck, &args, flag.Args())
 
 	ctx, cancel := context.WithCancel(context.Background())
@@ -25,7 +36,14 @@ func main() {
 	var wg sync.WaitGroup
 	wg.Add(1)
 
-	dlog.Start(ctx, &wg, source.HealthCheck, config.Common.LogLevel)
+	if pprof > -1 {
+		// For debugging purposes only
+		pprofArgs := fmt.Sprintf("0.0.0.0:%d", pprof)
+		go http.ListenAndServe(pprofArgs, nil)
+		dlog.Client.Info("Started PProf", pprofArgs)
+	}
+
+	dlog.Start(ctx, &wg, source.HealthCheck)
 	healthClient, _ := clients.NewHealthClient(args)
 	os.Exit(healthClient.Start(ctx, signal.NoCh(ctx)))
 }