As PersistenRuns are not chained

spf13/cobra#216 Added setting of loglevel in PersistentRun for all cctl sub commands Migrate command must also set the log level. Just that it should not call InitState()
platform9 · Oct 19, 2018 · 79f4e61 · 79f4e61
1 parent da963ae
commit 79f4e61
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 12 deletions.
diff --git a/cmd/backup.go b/cmd/backup.go
@@ -13,6 +13,11 @@ var backupCmd = &cobra.Command{
 	Short: "Create an archive with the current cctl state and an etcd snapshot from the cluster.",
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		InitState()
+		// PersistentPreRuns are not chained https://github.com/spf13/cobra/issues/216
+		// Therefore LogLevel must be set in all the PersistentPreRuns
+		if err := log.SetLogLevelUsingString(LogLevel); err != nil {
+			log.Fatalf("Unable to parse log level %s", LogLevel)
+		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		archivePath, err := cmd.Flags().GetString("archive")

diff --git a/cmd/create.go b/cmd/create.go
@@ -2,6 +2,8 @@ package cmd
 
 import (
 	"fmt"
+
+	log "github.com/platform9/cctl/pkg/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -12,6 +14,11 @@ var createCmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(1),
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		InitState()
+		// PersistentPreRuns are not chained https://github.com/spf13/cobra/issues/216
+		// Therefore LogLevel must be set in all the PersistentPreRuns
+		if err := log.SetLogLevelUsingString(LogLevel); err != nil {
+			log.Fatalf("Unable to parse log level %s", LogLevel)
+		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("create called")

diff --git a/cmd/delete.go b/cmd/delete.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 
+	log "github.com/platform9/cctl/pkg/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -13,6 +14,11 @@ var deleteCmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(1),
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		InitState()
+		// PersistentPreRuns are not chained https://github.com/spf13/cobra/issues/216
+		// Therefore LogLevel must be set in all the PersistentPreRuns
+		if err := log.SetLogLevelUsingString(LogLevel); err != nil {
+			log.Fatalf("Unable to parse log level %s", LogLevel)
+		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("delete called")

diff --git a/cmd/deploy.go b/cmd/deploy.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 
+	log "github.com/platform9/cctl/pkg/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -13,6 +14,11 @@ var deployCmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(1),
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		InitState()
+		// PersistentPreRuns are not chained https://github.com/spf13/cobra/issues/216
+		// Therefore LogLevel must be set in all the PersistentPreRuns
+		if err := log.SetLogLevelUsingString(LogLevel); err != nil {
+			log.Fatalf("Unable to parse log level %s", LogLevel)
+		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("Deploy called")

diff --git a/cmd/get.go b/cmd/get.go
@@ -15,6 +15,11 @@ var getCmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(1),
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		InitState()
+		// PersistentPreRuns are not chained https://github.com/spf13/cobra/issues/216
+		// Therefore LogLevel must be set in all the PersistentPreRuns
+		if err := log.SetLogLevelUsingString(LogLevel); err != nil {
+			log.Fatalf("Unable to parse log level %s", LogLevel)
+		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		log.Printf("Unknown resource %q. Use --help to print available options", args[0])

diff --git a/cmd/migrate.go b/cmd/migrate.go
@@ -19,6 +19,13 @@ import (
 var migrateCmd = &cobra.Command{
 	Use:   "migrate",
 	Short: "Migrate the state file to the current version",
+	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		// PersistentPreRuns are not chained https://github.com/spf13/cobra/issues/216
+		// Therefore LogLevel must be set in all the PersistentPreRuns
+		if err := log.SetLogLevelUsingString(LogLevel); err != nil {
+			log.Fatalf("Unable to parse log level %s", LogLevel)
+		}
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 		version, err := stateutil.VersionFromFile(stateFilename)
 		if err != nil {

diff --git a/cmd/recover.go b/cmd/recover.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	log "github.com/platform9/cctl/pkg/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -11,6 +12,11 @@ var recoverCmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(1),
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		InitState()
+		// PersistentPreRuns are not chained https://github.com/spf13/cobra/issues/216
+		// Therefore LogLevel must be set in all the PersistentPreRuns
+		if err := log.SetLogLevelUsingString(LogLevel); err != nil {
+			log.Fatalf("Unable to parse log level %s", LogLevel)
+		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 	},

diff --git a/cmd/restore.go b/cmd/restore.go
@@ -11,6 +11,11 @@ var restoreCmd = &cobra.Command{
 	Short: "Restore the cctl state and etcd snapshot from an archive.",
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		InitState()
+		// PersistentPreRuns are not chained https://github.com/spf13/cobra/issues/216
+		// Therefore LogLevel must be set in all the PersistentPreRuns
+		if err := log.SetLogLevelUsingString(LogLevel); err != nil {
+			log.Fatalf("Unable to parse log level %s", LogLevel)
+		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		archivePath, err := cmd.Flags().GetString("archive")

diff --git a/cmd/root.go b/cmd/root.go
@@ -6,7 +6,6 @@ import (
 
 	log "github.com/platform9/cctl/pkg/logrus"
 	cctlstate "github.com/platform9/cctl/pkg/state/v2"
-	"github.com/sirupsen/logrus"
 
 	spclientfake "github.com/platform9/ssh-provider/pkg/client/clientset_generated/clientset/fake"
 	"github.com/spf13/cobra"
@@ -20,13 +19,6 @@ var LogLevel string
 
 var rootCmd = &cobra.Command{
 	Use: "cctl",
-	PersistentPreRun: func(cmd *cobra.Command, args []string) {
-		logLevel, err := logrus.ParseLevel(LogLevel)
-		if err != nil {
-			log.Fatalf("Could not parse log level %v", logLevel)
-		}
-		log.SetLogLevel(logLevel)
-	},
 	PreRun: func(cmd *cobra.Command, args []string) {
 		InitState()
 	},

diff --git a/cmd/snapshot.go b/cmd/snapshot.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	log "github.com/platform9/cctl/pkg/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -10,6 +11,11 @@ var snapshotCmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(1),
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		InitState()
+		// PersistentPreRuns are not chained https://github.com/spf13/cobra/issues/216
+		// Therefore LogLevel must be set in all the PersistentPreRuns
+		if err := log.SetLogLevelUsingString(LogLevel); err != nil {
+			log.Fatalf("Unable to parse log level %s", LogLevel)
+		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 	},

diff --git a/cmd/upgrade.go b/cmd/upgrade.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 
+	log "github.com/platform9/cctl/pkg/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -13,6 +14,11 @@ var upgradeCmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(1),
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		InitState()
+		// PersistentPreRuns are not chained https://github.com/spf13/cobra/issues/216
+		// Therefore LogLevel must be set in all the PersistentPreRuns
+		if err := log.SetLogLevelUsingString(LogLevel); err != nil {
+			log.Fatalf("Unable to parse log level %s", LogLevel)
+		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("Upgrade called")

diff --git a/pkg/logrus/logrus.go b/pkg/logrus/logrus.go
@@ -3,6 +3,7 @@ package logrus
 import (
 	"os"
 
+	"github.com/sirupsen/logrus"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -11,17 +12,27 @@ var (
 	stdOut = log.New()
 	// used for error, fatal, panic
 	stdError = log.New()
-	logLevel log.Level
+	level    log.Level
 )
 
 // LogLevel returns the current log level
 func LogLevel() log.Level {
-	return logLevel
+	return level
+}
+
+// SetLogLevelUsingString sets level for both loggers
+func SetLogLevelUsingString(inputLevel string) error {
+	level, err := logrus.ParseLevel(inputLevel)
+	if err != nil {
+		return err
+	}
+	SetLogLevel(level)
+	return nil
 }
 
 // SetLogLevel sets level for both loggers
-func SetLogLevel(level log.Level) {
-	logLevel = level
+func SetLogLevel(inputLevel log.Level) {
+	level = inputLevel
 	stdOut.Out = os.Stdout
 	stdError.Out = os.Stderr
 	// used only for levels >= log.InfoLevel