From 4892c9dbdc95f8f6a335252d82ed80683eb3c07c Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Tue, 29 Nov 2022 03:55:50 +0300 Subject: [PATCH] :zap: Add `.Send()` call to logs without `.Msg()` call --- cmd/check.go | 2 +- cmd/common.go | 2 +- cmd/config.go | 2 +- cmd/logs.go | 2 +- cmd/root.go | 4 ++-- cmd/tap.go | 2 +- cmd/view.go | 4 ++-- config/config.go | 6 +++--- kubernetes/watch.go | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmd/check.go b/cmd/check.go index 16deef26a..17c305a00 100644 --- a/cmd/check.go +++ b/cmd/check.go @@ -21,7 +21,7 @@ func init() { defaultCheckConfig := configStructs.CheckConfig{} if err := defaults.Set(&defaultCheckConfig); err != nil { - log.Error().Err(err) + log.Error().Err(err).Send() } checkCmd.Flags().Bool(configStructs.PreTapCheckName, defaultCheckConfig.PreTap, "Check pre-tap Kubeshark installation for potential problems") diff --git a/cmd/common.go b/cmd/common.go index 4eb064fa0..fd7d4447b 100644 --- a/cmd/common.go +++ b/cmd/common.go @@ -93,7 +93,7 @@ func handleKubernetesProviderError(err error) { if ok := errors.As(err, &clusterBehindProxyErr); ok { log.Error().Msg(fmt.Sprintf("Cannot establish http-proxy connection to the Kubernetes cluster. If you’re using Lens or similar tool, please run kubeshark with regular kubectl config using --%v %v=$HOME/.kube/config flag", config.SetCommandName, config.KubeConfigPathConfigName)) } else { - log.Error().Err(err) + log.Error().Err(err).Send() } } diff --git a/cmd/config.go b/cmd/config.go index c857e76de..6a54b9628 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -48,7 +48,7 @@ func init() { defaultConfig := config.CreateDefaultConfig() if err := defaults.Set(&defaultConfig); err != nil { - log.Debug().Err(err) + log.Debug().Err(err).Send() } configCmd.Flags().BoolP(configStructs.RegenerateConfigName, "r", defaultConfig.Config.Regenerate, fmt.Sprintf("Regenerate the config file with default values to path %s or to chosen path using --%s", defaultConfig.ConfigFilePath, config.ConfigFilePathCommandName)) diff --git a/cmd/logs.go b/cmd/logs.go index 0d3eeeab4..54a567130 100644 --- a/cmd/logs.go +++ b/cmd/logs.go @@ -41,7 +41,7 @@ func init() { defaultLogsConfig := configStructs.LogsConfig{} if err := defaults.Set(&defaultLogsConfig); err != nil { - log.Debug().Err(err) + log.Debug().Err(err).Send() } logsCmd.Flags().StringP(configStructs.FileLogsName, "f", defaultLogsConfig.FileStr, "Path for zip file (default current \\kubeshark_logs.zip)") diff --git a/cmd/root.go b/cmd/root.go index 095ea7cda..5f84ae72b 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -17,7 +17,7 @@ var rootCmd = &cobra.Command{ Further info is available at https://github.com/kubeshark/kubeshark`, PersistentPreRunE: func(cmd *cobra.Command, args []string) error { if err := config.InitConfig(cmd); err != nil { - log.Fatal().Err(err) + log.Fatal().Err(err).Send() } return nil @@ -27,7 +27,7 @@ Further info is available at https://github.com/kubeshark/kubeshark`, func init() { defaultConfig := config.CreateDefaultConfig() if err := defaults.Set(&defaultConfig); err != nil { - log.Debug().Err(err) + log.Debug().Err(err).Send() } rootCmd.PersistentFlags().StringSlice(config.SetCommandName, []string{}, fmt.Sprintf("Override values using --%s", config.SetCommandName)) diff --git a/cmd/tap.go b/cmd/tap.go index d2078bbc3..f28fd2dbc 100644 --- a/cmd/tap.go +++ b/cmd/tap.go @@ -44,7 +44,7 @@ func init() { defaultTapConfig := configStructs.TapConfig{} if err := defaults.Set(&defaultTapConfig); err != nil { - log.Debug().Err(err) + log.Debug().Err(err).Send() } tapCmd.Flags().Uint16P(configStructs.GuiPortTapName, "p", defaultTapConfig.GuiPort, "Provide a custom port for the web interface webserver") diff --git a/cmd/view.go b/cmd/view.go index cab92f77c..3177fb50e 100644 --- a/cmd/view.go +++ b/cmd/view.go @@ -21,13 +21,13 @@ func init() { defaultViewConfig := configStructs.ViewConfig{} if err := defaults.Set(&defaultViewConfig); err != nil { - log.Error().Err(err) + log.Error().Err(err).Send() } viewCmd.Flags().Uint16P(configStructs.GuiPortViewName, "p", defaultViewConfig.GuiPort, "Provide a custom port for the web interface webserver") viewCmd.Flags().StringP(configStructs.UrlViewName, "u", defaultViewConfig.Url, "Provide a custom host") if err := viewCmd.Flags().MarkHidden(configStructs.UrlViewName); err != nil { - log.Error().Err(err) + log.Error().Err(err).Send() } } diff --git a/config/config.go b/config/config.go index c271b5127..f4b7705f9 100644 --- a/config/config.go +++ b/config/config.go @@ -139,20 +139,20 @@ func initFlag(f *pflag.Flag) { sliceValue, isSliceValue := f.Value.(pflag.SliceValue) if !isSliceValue { if err := mergeFlagValue(configElemValue, flagPath, strings.Join(flagPath, "."), f.Value.String()); err != nil { - log.Warn().Err(err) + log.Warn().Err(err).Send() } return } if f.Name == SetCommandName { if err := mergeSetFlag(configElemValue, sliceValue.GetSlice()); err != nil { - log.Warn().Err(err) + log.Warn().Err(err).Send() } return } if err := mergeFlagValues(configElemValue, flagPath, strings.Join(flagPath, "."), sliceValue.GetSlice()); err != nil { - log.Warn().Err(err) + log.Warn().Err(err).Send() } } diff --git a/kubernetes/watch.go b/kubernetes/watch.go index 91bfe4974..3692583c3 100644 --- a/kubernetes/watch.go +++ b/kubernetes/watch.go @@ -56,7 +56,7 @@ func FilteredWatch(ctx context.Context, watcherCreator WatchCreator, targetNames } else { if !watchRestartDebouncer.IsOn() { if err := watchRestartDebouncer.SetOn(); err != nil { - log.Error().Err(err) + log.Error().Err(err).Send() } log.Warn().Msg("K8s watch channel closed, restarting watcher...") time.Sleep(time.Second * 5)