Merge pull request cri-o#779 from nalind/kpod-debug-flag

Mrunal Patel · web-flow · commit c9d27ad11156 · 2017-08-18T16:23:32.000-07:00
kpod: make --debug work
diff --git a/cmd/kpod/common.go b/cmd/kpod/common.go
@@ -7,7 +7,6 @@ import (
 	"github.com/containers/storage"
 	"github.com/fatih/camelcase"
 	"github.com/kubernetes-incubator/cri-o/libkpod"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
 
@@ -50,9 +49,6 @@ func getConfig(c *cli.Context) (*libkpod.Config, error) {
 			config.StorageOptions = opts
 		}
 	}
-	if c.Bool("debug") {
-		logrus.SetLevel(logrus.DebugLevel)
-	}
 	if c.GlobalIsSet("runtime") {
 		config.Runtime = c.GlobalString("runtime")
 	}
diff --git a/cmd/kpod/main.go b/cmd/kpod/main.go
@@ -15,7 +15,6 @@ func main() {
 	if reexec.Init() {
 		return
 	}
-	logrus.SetLevel(logrus.ErrorLevel)
 
 	app := cli.NewApp()
 	app.Name = "kpod"
@@ -44,6 +43,13 @@ func main() {
 		statsCommand,
 		loadCommand,
 	}
+	app.Before = func(c *cli.Context) error {
+		logrus.SetLevel(logrus.ErrorLevel)
+		if c.GlobalBool("debug") {
+			logrus.SetLevel(logrus.DebugLevel)
+		}
+		return nil
+	}
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
 			Name:  "config, c",

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ import (`
`7`	`7`	`"github.com/containers/storage"`
`8`	`8`	`"github.com/fatih/camelcase"`
`9`	`9`	`"github.com/kubernetes-incubator/cri-o/libkpod"`
`10`		`- "github.com/sirupsen/logrus"`
`11`	`10`	`"github.com/urfave/cli"`
`12`	`11`	`)`
`13`	`12`
`@@ -50,9 +49,6 @@ func getConfig(c cli.Context) (libkpod.Config, error) {`
`50`	`49`	`config.StorageOptions = opts`
`51`	`50`	`}`
`52`	`51`	`}`
`53`		`- if c.Bool("debug") {`
`54`		`- logrus.SetLevel(logrus.DebugLevel)`
`55`		`- }`
`56`	`52`	`if c.GlobalIsSet("runtime") {`
`57`	`53`	`config.Runtime = c.GlobalString("runtime")`
`58`	`54`	`}`