From 74da75e966195b376f1b78d19c5f4a644ea2bf9f Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Tue, 27 Dec 2022 08:05:05 +0300 Subject: [PATCH] :zap: Add `-debug` flag if debug mode is enabled --- cmd/pcapRunner.go | 14 ++++++++++++-- cmd/root.go | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/cmd/pcapRunner.go b/cmd/pcapRunner.go index 3dd7eef67..733919695 100644 --- a/cmd/pcapRunner.go +++ b/cmd/pcapRunner.go @@ -108,9 +108,14 @@ func pcap() { }, } + cmdHub := []string{"-port", fmt.Sprintf("%d", config.Config.Tap.Hub.DstPort)} + if config.DebugMode { + cmdHub = append(cmdHub, fmt.Sprintf("-%s", config.DebugFlag)) + } + respHub, err := cli.ContainerCreate(ctx, &container.Config{ Image: imageHub, - Cmd: []string{"-port", fmt.Sprintf("%d", config.Config.Tap.Hub.DstPort), "-debug"}, + Cmd: cmdHub, Tty: false, ExposedPorts: nat.PortSet{nat.Port(fmt.Sprintf("%d/tcp", config.Config.Tap.Hub.DstPort)): {}}, }, hostConfigHub, nil, nil, "kubeshark-hub") @@ -124,9 +129,14 @@ func pcap() { return } + cmdWorker := []string{"-i", "any", "-port", fmt.Sprintf("%d", config.Config.Tap.Worker.DstPort)} + if config.DebugMode { + cmdWorker = append(cmdWorker, fmt.Sprintf("-%s", config.DebugFlag)) + } + respWorker, err := cli.ContainerCreate(ctx, &container.Config{ Image: imageWorker, - Cmd: []string{"-i", "any", "-port", fmt.Sprintf("%d", config.Config.Tap.Worker.DstPort), "-debug"}, + Cmd: cmdWorker, Tty: false, }, nil, nil, nil, "kubeshark-worker") if err != nil { diff --git a/cmd/root.go b/cmd/root.go index 5f793d49d..f4d7330da 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -32,7 +32,7 @@ func init() { rootCmd.PersistentFlags().StringSlice(config.SetCommandName, []string{}, fmt.Sprintf("Override values using --%s", config.SetCommandName)) rootCmd.PersistentFlags().String(config.ConfigFilePathCommandName, defaultConfig.ConfigFilePath, fmt.Sprintf("Override config file path using --%s", config.ConfigFilePathCommandName)) - rootCmd.PersistentFlags().BoolP("debug", "d", false, "Enable debug mode.") + rootCmd.PersistentFlags().BoolP(config.DebugFlag, "d", false, "Enable debug mode.") } // Execute adds all child commands to the root command and sets flags appropriately.