diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/dcat/main.go | 1 | ||||
| -rw-r--r-- | cmd/dgrep/main.go | 1 | ||||
| -rw-r--r-- | cmd/dmap/main.go | 6 | ||||
| -rw-r--r-- | cmd/dtail/main.go | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go index 0c66a98..e2736d6 100644 --- a/cmd/dcat/main.go +++ b/cmd/dcat/main.go @@ -36,6 +36,7 @@ func main() { flag.BoolVar(&displayVersion, "version", false, "Display version") flag.IntVar(&args.ConnectionsPerCPU, "cpc", config.DefaultConnectionsPerCPU, "How many connections established per CPU core concurrently") + flag.IntVar(&args.SSHAgentKeyIndex, "agentKeyIndex", -1, "SSH agent key index to use (-1 for all keys)") 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") diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go index 14cfb0c..c0a91eb 100644 --- a/cmd/dgrep/main.go +++ b/cmd/dgrep/main.go @@ -40,6 +40,7 @@ func main() { flag.IntVar(&args.LContext.AfterContext, "after", 0, "Print lines of trailing context after matching lines") flag.IntVar(&args.LContext.BeforeContext, "before", 0, "Print lines of leading context before matching lines") flag.IntVar(&args.LContext.MaxCount, "max", 0, "Stop reading file after NUM matching lines") + flag.IntVar(&args.SSHAgentKeyIndex, "agentKeyIndex", -1, "SSH agent key index to use (-1 for all keys)") 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") diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go index 7500ea6..ea5f020 100644 --- a/cmd/dmap/main.go +++ b/cmd/dmap/main.go @@ -28,7 +28,8 @@ func main() { var profileFlags profiling.Flags args := config.Args{ - Mode: omode.MapClient, + Mode: omode.MapClient, + SSHAgentKeyIndex: -1, } userName := user.Name() @@ -39,6 +40,7 @@ func main() { flag.BoolVar(&displayVersion, "version", false, "Display version") flag.IntVar(&args.ConnectionsPerCPU, "cpc", config.DefaultConnectionsPerCPU, "How many connections established per CPU core concurrently") + flag.IntVar(&args.SSHAgentKeyIndex, "agentKeyIndex", -1, "SSH agent key index to use (-1 for all keys)") 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") @@ -89,7 +91,7 @@ func main() { dlog.Client.FatalPanic(err) } - status := client.Start(ctx, signal.InterruptCh(ctx)) + status := client.Start(ctx, signal.InterruptChWithCancel(ctx, cancel)) // Log final metrics if profiling is enabled if profileFlags.Enabled() { diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go index 3d363cb..188f518 100644 --- a/cmd/dtail/main.go +++ b/cmd/dtail/main.go @@ -51,6 +51,7 @@ func main() { flag.IntVar(&args.LContext.AfterContext, "after", 0, "Print lines of trailing context after matching lines") flag.IntVar(&args.LContext.BeforeContext, "before", 0, "Print lines of leading context before matching lines") flag.IntVar(&args.LContext.MaxCount, "max", 0, "Stop reading file after NUM matching lines") + flag.IntVar(&args.SSHAgentKeyIndex, "agentKeyIndex", -1, "SSH agent key index to use (-1 for all keys)") 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(&shutdownAfter, "shutdownAfter", 3600*24, "Shutdown after so many seconds") @@ -137,7 +138,7 @@ func main() { } } - status := client.Start(ctx, signal.InterruptCh(ctx)) + status := client.Start(ctx, signal.InterruptChWithCancel(ctx, cancel)) // Log final metrics if profiling is enabled if profileFlags.Enabled() { |