diff --git a/hrp/cmd/boom.go b/hrp/cmd/boom.go index 0c6138f1..118f8083 100644 --- a/hrp/cmd/boom.go +++ b/hrp/cmd/boom.go @@ -18,11 +18,6 @@ var boomCmd = &cobra.Command{ $ hrp boom examples/ # run testcases in specified folder`, Args: cobra.MinimumNArgs(1), Run: func(cmd *cobra.Command, args []string) { - hrp.SetLogLevel(logLevel) - if !logJSON { - hrp.SetLogPretty() - } - var paths []hrp.ITestCase for _, arg := range args { paths = append(paths, &hrp.TestCasePath{Path: arg}) diff --git a/hrp/cmd/har2case.go b/hrp/cmd/har2case.go index db001839..749ff4e4 100644 --- a/hrp/cmd/har2case.go +++ b/hrp/cmd/har2case.go @@ -4,7 +4,6 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/httprunner/hrp" "github.com/httprunner/hrp/har2case" ) @@ -15,11 +14,6 @@ var har2caseCmd = &cobra.Command{ Long: `Convert HAR to json/yaml testcase files`, Args: cobra.MinimumNArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - hrp.SetLogLevel(logLevel) - if !logJSON { - hrp.SetLogPretty() - } - var outputFiles []string for _, arg := range args { var outputPath string diff --git a/hrp/cmd/root.go b/hrp/cmd/root.go index cbcb4ffb..6785c2c6 100644 --- a/hrp/cmd/root.go +++ b/hrp/cmd/root.go @@ -18,6 +18,12 @@ var RootCmd = &cobra.Command{ License: Apache-2.0 Github: https://github.com/httprunner/hrp Copyright 2021 debugtalk`, + PersistentPreRun: func(cmd *cobra.Command, args []string) { + if !logJSON { + hrp.SetLogPretty() + } + hrp.SetLogLevel(logLevel) + }, Version: hrp.VERSION, } diff --git a/hrp/cmd/run.go b/hrp/cmd/run.go index b60a9213..782cff8c 100644 --- a/hrp/cmd/run.go +++ b/hrp/cmd/run.go @@ -16,11 +16,6 @@ var runCmd = &cobra.Command{ $ hrp run examples/ # run testcases in specified folder`, Args: cobra.MinimumNArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - hrp.SetLogLevel(logLevel) - if !logJSON { - hrp.SetLogPretty() - } - var paths []hrp.ITestCase for _, arg := range args { paths = append(paths, &hrp.TestCasePath{Path: arg}) diff --git a/log.go b/log.go index bb13fd4c..af5dcf9c 100644 --- a/log.go +++ b/log.go @@ -30,8 +30,8 @@ func SetLogLevel(level string) { } func SetLogPretty() { - log.Info().Msg("Set log to pretty console") log = log.Output(zerolog.ConsoleWriter{Out: os.Stderr}) + log.Info().Msg("Set log to pretty console") } func GetLogger() zerolog.Logger {