merge develop

5 files changed, 4 insertions, 92 deletions

diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go
index f0ea946..05e46ab 100644
--- a/cmd/dcat/main.go
+++ b/cmd/dcat/main.go
@@ -55,7 +55,7 @@ func main() {
 		panic(err)
 	}
 
-	status := client.Start(ctx, signal.StatsCh(ctx))
+	status := client.Start(ctx, signal.InterruptCh(ctx))
 	logger.Flush()
 	os.Exit(status)
 }
diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go
index d1fdc21..133631f 100644
--- a/cmd/dgrep/main.go
+++ b/cmd/dgrep/main.go
@@ -63,7 +63,7 @@ func main() {
 		panic(err)
 	}
 
-	status := client.Start(ctx, signal.StatsCh(ctx))
+	status := client.Start(ctx, signal.InterruptCh(ctx))
 	logger.Flush()
 	os.Exit(status)
 }
diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go
index 279b343..9f9ca9d 100644
--- a/cmd/dmap/main.go
+++ b/cmd/dmap/main.go
@@ -62,7 +62,7 @@ func main() {
 		panic(err)
 	}
 
-	status := client.Start(ctx, signal.StatsCh(ctx))
+	status := client.Start(ctx, signal.InterruptCh(ctx))
 	logger.Flush()
 	os.Exit(status)
 }
diff --git a/cmd/drun/main.go b/cmd/drun/main.go
deleted file mode 100644
index ffdf7bf..0000000
--- a/cmd/drun/main.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package main
-
-import (
-	"context"
-	"flag"
-	"io/ioutil"
-	"os"
-	"strings"
-
-	"github.com/mimecast/dtail/internal/clients"
-	"github.com/mimecast/dtail/internal/color"
-	"github.com/mimecast/dtail/internal/config"
-	"github.com/mimecast/dtail/internal/io/logger"
-	"github.com/mimecast/dtail/internal/io/signal"
-	"github.com/mimecast/dtail/internal/user"
-	"github.com/mimecast/dtail/internal/version"
-)
-
-// The evil begins here.
-func main() {
-	var args clients.Args
-	var background string
-	var cfgFile string
-	var command string
-	var debugEnable bool
-	var displayVersion bool
-	var jobName string
-	var noColor bool
-	var sshPort int
-
-	userName := user.Name()
-
-	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Auto trust all unknown host keys")
-	flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages")
-	flag.BoolVar(&displayVersion, "version", false, "Display version")
-	flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors")
-	flag.IntVar(&args.ConnectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
-	flag.IntVar(&args.Timeout, "timeout", 0, "Command execution timeout")
-	flag.IntVar(&sshPort, "port", 2222, "SSH server port")
-	flag.StringVar(&args.Discovery, "discovery", "", "Server discovery method")
-	flag.StringVar(&args.PrivateKeyPathFile, "key", "", "Path to private key")
-	flag.StringVar(&args.ServersStr, "servers", "", "Remote servers to connect")
-	flag.StringVar(&args.UserName, "user", userName, "Your system user name")
-	flag.StringVar(&background, "background", "", "Can be one of 'start', 'cancel', 'list' or empty")
-	flag.StringVar(&cfgFile, "cfg", "", "Config file path")
-	flag.StringVar(&command, "command", "", "Command to run")
-	flag.StringVar(&jobName, "name", "", "The job name (if run in background)")
-
-	flag.Parse()
-
-	config.Read(cfgFile, sshPort)
-	color.Colored = !noColor
-
-	if displayVersion {
-		version.PrintAndExit()
-	}
-
-	ctx := context.TODO()
-	logger.Start(ctx, logger.Modes{Debug: debugEnable || config.Common.DebugEnable})
-
-	args.What, args.Arguments = readCommand(command)
-	client, err := clients.NewRunClient(args, background, jobName)
-	if err != nil {
-		panic(err)
-	}
-
-	status := client.Start(ctx, signal.StatsCh(ctx))
-	logger.Flush()
-	os.Exit(status)
-}
-
-func readCommand(command string) (string, []string) {
-	splitted := strings.Split(command, " ")
-
-	script := splitted[0]
-	if _, err := os.Stat(script); os.IsNotExist(err) {
-		var commandArgs []string
-		return command, commandArgs
-	}
-	commandArgs := splitted[1:]
-
-	bytes, err := ioutil.ReadFile(script)
-	if err != nil {
-		panic(err)
-	}
-
-	return string(bytes), commandArgs
-}
diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go
index ff9028b..aefaa6a 100644
--- a/cmd/dtail/main.go
+++ b/cmd/dtail/main.go
@@ -106,7 +106,7 @@ func main() {
 		}
 	}
 
-	status := client.Start(ctx, signal.StatsCh(ctx))
+	status := client.Start(ctx, signal.InterruptCh(ctx))
 	logger.Flush()
 	os.Exit(status)
 }