mirror of
https://github.com/httprunner/httprunner.git
synced 2026-09-07 16:40:50 +08:00
feat: add hrp.InitLogger
This commit is contained in:
+2
-58
@@ -1,17 +1,9 @@
|
|||||||
package cmd
|
package cmd
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"runtime"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/rs/zerolog"
|
|
||||||
"github.com/rs/zerolog/log"
|
|
||||||
"github.com/rs/zerolog/pkgerrors"
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
|
"github.com/httprunner/httprunner/v4/hrp"
|
||||||
"github.com/httprunner/httprunner/v4/hrp/cmd/adb"
|
"github.com/httprunner/httprunner/v4/hrp/cmd/adb"
|
||||||
"github.com/httprunner/httprunner/v4/hrp/cmd/ios"
|
"github.com/httprunner/httprunner/v4/hrp/cmd/ios"
|
||||||
"github.com/httprunner/httprunner/v4/hrp/code"
|
"github.com/httprunner/httprunner/v4/hrp/code"
|
||||||
@@ -39,7 +31,7 @@ Website: https://httprunner.com
|
|||||||
Github: https://github.com/httprunner/httprunner
|
Github: https://github.com/httprunner/httprunner
|
||||||
Copyright 2017 debugtalk`,
|
Copyright 2017 debugtalk`,
|
||||||
PersistentPreRun: func(cmd *cobra.Command, args []string) {
|
PersistentPreRun: func(cmd *cobra.Command, args []string) {
|
||||||
initLogger(logLevel, logJSON)
|
hrp.InitLogger(logLevel, logJSON)
|
||||||
},
|
},
|
||||||
Version: version.VERSION,
|
Version: version.VERSION,
|
||||||
TraverseChildren: true, // parses flags on all parents before executing child command
|
TraverseChildren: true, // parses flags on all parents before executing child command
|
||||||
@@ -65,51 +57,3 @@ func Execute() int {
|
|||||||
err := rootCmd.Execute()
|
err := rootCmd.Execute()
|
||||||
return code.GetErrorCode(err)
|
return code.GetErrorCode(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
func initLogger(logLevel string, logJSON bool) {
|
|
||||||
// Error Logging with Stacktrace
|
|
||||||
zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack
|
|
||||||
|
|
||||||
// set log timestamp precise to milliseconds
|
|
||||||
zerolog.TimeFieldFormat = "2006-01-02T15:04:05.999Z0700"
|
|
||||||
|
|
||||||
// init log writer
|
|
||||||
var writer io.Writer
|
|
||||||
if !logJSON {
|
|
||||||
// log a human-friendly, colorized output
|
|
||||||
noColor := false
|
|
||||||
if runtime.GOOS == "windows" {
|
|
||||||
noColor = true
|
|
||||||
}
|
|
||||||
|
|
||||||
writer = zerolog.ConsoleWriter{
|
|
||||||
Out: os.Stderr,
|
|
||||||
TimeFormat: time.RFC3339Nano,
|
|
||||||
NoColor: noColor,
|
|
||||||
}
|
|
||||||
log.Info().Msg("log with colorized console")
|
|
||||||
} else {
|
|
||||||
// default logger
|
|
||||||
log.Info().Msg("log with json output")
|
|
||||||
writer = os.Stderr
|
|
||||||
}
|
|
||||||
log.Logger = zerolog.New(writer).With().Timestamp().Logger()
|
|
||||||
|
|
||||||
// Setting Global Log Level
|
|
||||||
level := strings.ToUpper(logLevel)
|
|
||||||
log.Info().Str("log_level", level).Msg("set global log level")
|
|
||||||
switch level {
|
|
||||||
case "DEBUG":
|
|
||||||
zerolog.SetGlobalLevel(zerolog.DebugLevel)
|
|
||||||
case "INFO":
|
|
||||||
zerolog.SetGlobalLevel(zerolog.InfoLevel)
|
|
||||||
case "WARN":
|
|
||||||
zerolog.SetGlobalLevel(zerolog.WarnLevel)
|
|
||||||
case "ERROR":
|
|
||||||
zerolog.SetGlobalLevel(zerolog.ErrorLevel)
|
|
||||||
case "FATAL":
|
|
||||||
zerolog.SetGlobalLevel(zerolog.FatalLevel)
|
|
||||||
case "PANIC":
|
|
||||||
zerolog.SetGlobalLevel(zerolog.PanicLevel)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package hrp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"runtime"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/rs/zerolog"
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
|
"github.com/rs/zerolog/pkgerrors"
|
||||||
|
)
|
||||||
|
|
||||||
|
func InitLogger(logLevel string, logJSON bool) {
|
||||||
|
// Error Logging with Stacktrace
|
||||||
|
zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack
|
||||||
|
|
||||||
|
// set log timestamp precise to milliseconds
|
||||||
|
zerolog.TimeFieldFormat = "2006-01-02T15:04:05.999Z0700"
|
||||||
|
|
||||||
|
// init log writer
|
||||||
|
var msg string
|
||||||
|
var writer io.Writer
|
||||||
|
if !logJSON {
|
||||||
|
// log a human-friendly, colorized output
|
||||||
|
noColor := false
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
noColor = true
|
||||||
|
}
|
||||||
|
|
||||||
|
writer = zerolog.ConsoleWriter{
|
||||||
|
Out: os.Stderr,
|
||||||
|
TimeFormat: time.RFC3339Nano,
|
||||||
|
NoColor: noColor,
|
||||||
|
}
|
||||||
|
msg = "log with colorized console"
|
||||||
|
} else {
|
||||||
|
// default logger
|
||||||
|
writer = os.Stderr
|
||||||
|
msg = "log with json output"
|
||||||
|
}
|
||||||
|
log.Logger = zerolog.New(writer).With().Timestamp().Logger()
|
||||||
|
log.Info().Msg(msg)
|
||||||
|
|
||||||
|
// Setting Global Log Level
|
||||||
|
level := strings.ToUpper(logLevel)
|
||||||
|
log.Info().Str("log_level", level).Msg("set global log level")
|
||||||
|
switch level {
|
||||||
|
case "DEBUG":
|
||||||
|
zerolog.SetGlobalLevel(zerolog.DebugLevel)
|
||||||
|
case "INFO":
|
||||||
|
zerolog.SetGlobalLevel(zerolog.InfoLevel)
|
||||||
|
case "WARN":
|
||||||
|
zerolog.SetGlobalLevel(zerolog.WarnLevel)
|
||||||
|
case "ERROR":
|
||||||
|
zerolog.SetGlobalLevel(zerolog.ErrorLevel)
|
||||||
|
case "FATAL":
|
||||||
|
zerolog.SetGlobalLevel(zerolog.FatalLevel)
|
||||||
|
case "PANIC":
|
||||||
|
zerolog.SetGlobalLevel(zerolog.PanicLevel)
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user