From 268c4fd0afe2e9aef1384dae61007c6244cd1f50 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Mon, 18 Oct 2021 10:04:45 +0800 Subject: [PATCH] feat: global set log with pretty console --- hrp/cmd/boom.go | 4 ++++ hrp/cmd/har2case.go | 4 ++++ hrp/cmd/run.go | 4 ++++ log.go | 9 +++++---- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/hrp/cmd/boom.go b/hrp/cmd/boom.go index 6de19900..0c6138f1 100644 --- a/hrp/cmd/boom.go +++ b/hrp/cmd/boom.go @@ -19,6 +19,10 @@ var boomCmd = &cobra.Command{ 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 4a3088af..db001839 100644 --- a/hrp/cmd/har2case.go +++ b/hrp/cmd/har2case.go @@ -16,6 +16,10 @@ var har2caseCmd = &cobra.Command{ 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/run.go b/hrp/cmd/run.go index f23c08b1..b60a9213 100644 --- a/hrp/cmd/run.go +++ b/hrp/cmd/run.go @@ -17,6 +17,10 @@ var runCmd = &cobra.Command{ 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 c943208a..bb13fd4c 100644 --- a/log.go +++ b/log.go @@ -10,10 +10,6 @@ import ( var log = zlog.Logger -func init() { - log = log.Output(zerolog.ConsoleWriter{Out: os.Stderr}) -} - func SetLogLevel(level string) { level = strings.ToUpper(level) log.Info().Msgf("Set log level to %s", level) @@ -33,6 +29,11 @@ func SetLogLevel(level string) { } } +func SetLogPretty() { + log.Info().Msg("Set log to pretty console") + log = log.Output(zerolog.ConsoleWriter{Out: os.Stderr}) +} + func GetLogger() zerolog.Logger { return log }