fix cli logger (#236)

* fix logger

* bump

Author: roi-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.216
+VERSION=v0.0.217
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.216/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.217/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.216/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.217/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.0
-  version: 0.0.216
+  version: 0.0.217
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/log/logrus.go

@@ -62,32 +62,46 @@ func GetLogrusEntry(l Logger) (*logrus.Entry, error) {
 	return adpt.Entry, nil
 }
 
+func initCommands(cmds []*cobra.Command, initFunc func(*cobra.Command)) {
+	for _, cmd := range cmds {
+		initFunc(cmd)
+		if cmd.HasSubCommands() {
+			initCommands(cmd.Commands(), initFunc)
+		}
+	}
+}
+
 func (l *logrusAdapter) AddPFlags(cmd *cobra.Command) {
 	flags := pflag.NewFlagSet("logrus", pflag.ContinueOnError)
 	flags.StringVar(&l.c.Level, "log-level", l.c.Level, `set the log level, e.g. "debug", "info", "warn", "error"`)
 	format := flags.String("log-format", defaultFormatter, `set the log format: "text", "json"`)
 
 	cmd.PersistentFlags().AddFlagSet(flags)
-	orgPreRun := cmd.PersistentPreRunE
-
-	cmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
-		switch *format {
-		case string(FormatterJSON), string(FormatterText):
-			l.c.Format = LogrusFormatter(*format)
-		default:
-			return fmt.Errorf("invalid log format: %s", *format)
-		}
 
-		if err := l.configure(flags); err != nil {
-			return err
-		}
-
-		if orgPreRun != nil {
-			return orgPreRun(cmd, args)
+	initFunc := func(cmd *cobra.Command) {
+		orgPreRun := cmd.PreRunE
+
+		cmd.PreRunE = func(cmd *cobra.Command, args []string) error {
+			switch *format {
+			case string(FormatterJSON), string(FormatterText):
+				l.c.Format = LogrusFormatter(*format)
+			default:
+				return fmt.Errorf("invalid log format: %s", *format)
+			}
+
+			if err := l.configure(flags); err != nil {
+				return err
+			}
+
+			if orgPreRun != nil {
+				return orgPreRun(cmd, args)
+			}
+			return nil
 		}
-		return nil
 	}
 
+	cobra.OnInitialize(func() { initCommands(cmd.Commands(), initFunc) })
+
 	cmdutil.LogFormat = *format
 	cmdutil.LogLevel = l.c.Level
 }