mirror of
https://github.com/httprunner/httprunner.git
synced 2026-06-29 19:41:27 +08:00
feat: implement separate log levels for console and file output
- Console logger respects user-specified log level - File logger always uses DEBUG level to capture all logs - Add custom leveledMultiWriter for different output levels - Remove global log level setting for more granular control
This commit is contained in:
@@ -1 +1 @@
|
||||
v5.0.0-beta-2506091718
|
||||
v5.0.0-beta-2506091916
|
||||
|
||||
95
logger.go
95
logger.go
@@ -24,7 +24,6 @@ func InitLogger(logLevel string, logJSON bool) {
|
||||
|
||||
// init log writers
|
||||
var msg string
|
||||
var writers []io.Writer
|
||||
|
||||
// console writer
|
||||
var consoleWriter io.Writer
|
||||
@@ -46,7 +45,9 @@ func InitLogger(logLevel string, logJSON bool) {
|
||||
consoleWriter = os.Stderr
|
||||
msg = "log with json console and file output"
|
||||
}
|
||||
writers = append(writers, consoleWriter)
|
||||
|
||||
// parse console log level
|
||||
consoleLevel := parseLogLevel(logLevel)
|
||||
|
||||
// file writer - write to results/taskID/hrp.log
|
||||
cfg := config.GetConfig()
|
||||
@@ -55,33 +56,97 @@ func InitLogger(logLevel string, logJSON bool) {
|
||||
// create or open log file
|
||||
logFile, err := os.OpenFile(logFilePath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o666)
|
||||
if err != nil {
|
||||
// if file creation failed, use console logger only
|
||||
log.Logger = zerolog.New(consoleWriter).With().Timestamp().Logger().Level(consoleLevel)
|
||||
log.Error().Err(err).Str("logFilePath", logFilePath).Msg("create log file failed")
|
||||
} else {
|
||||
// add file writer to writers list
|
||||
writers = append(writers, logFile)
|
||||
// create a custom writer that applies different log levels
|
||||
multiWriter := &leveledMultiWriter{
|
||||
consoleWriter: consoleWriter,
|
||||
consoleLevel: consoleLevel,
|
||||
fileWriter: logFile,
|
||||
fileLevel: zerolog.DebugLevel,
|
||||
}
|
||||
log.Logger = zerolog.New(multiWriter).With().Timestamp().Logger()
|
||||
log.Info().Str("logFilePath", logFilePath).Msg("log file created successfully")
|
||||
}
|
||||
|
||||
// create multi writer to write to both console and file
|
||||
multiWriter := io.MultiWriter(writers...)
|
||||
log.Logger = zerolog.New(multiWriter).With().Timestamp().Logger()
|
||||
log.Info().Msg(msg)
|
||||
log.Info().Str("console_log_level", strings.ToUpper(logLevel)).Str("file_log_level", "DEBUG").Msg("logger initialized with different levels")
|
||||
}
|
||||
|
||||
// Setting Global Log Level
|
||||
// parseLogLevel converts string log level to zerolog.Level
|
||||
func parseLogLevel(logLevel string) zerolog.Level {
|
||||
level := strings.ToUpper(logLevel)
|
||||
log.Info().Str("log_level", level).Msg("set global log level")
|
||||
switch level {
|
||||
case "DEBUG":
|
||||
zerolog.SetGlobalLevel(zerolog.DebugLevel)
|
||||
return zerolog.DebugLevel
|
||||
case "INFO":
|
||||
zerolog.SetGlobalLevel(zerolog.InfoLevel)
|
||||
return zerolog.InfoLevel
|
||||
case "WARN":
|
||||
zerolog.SetGlobalLevel(zerolog.WarnLevel)
|
||||
return zerolog.WarnLevel
|
||||
case "ERROR":
|
||||
zerolog.SetGlobalLevel(zerolog.ErrorLevel)
|
||||
return zerolog.ErrorLevel
|
||||
case "FATAL":
|
||||
zerolog.SetGlobalLevel(zerolog.FatalLevel)
|
||||
return zerolog.FatalLevel
|
||||
case "PANIC":
|
||||
zerolog.SetGlobalLevel(zerolog.PanicLevel)
|
||||
return zerolog.PanicLevel
|
||||
default:
|
||||
return zerolog.InfoLevel
|
||||
}
|
||||
}
|
||||
|
||||
// leveledMultiWriter is a custom writer that applies different log levels to different outputs
|
||||
type leveledMultiWriter struct {
|
||||
consoleWriter io.Writer
|
||||
consoleLevel zerolog.Level
|
||||
fileWriter io.Writer
|
||||
fileLevel zerolog.Level
|
||||
}
|
||||
|
||||
func (w *leveledMultiWriter) Write(p []byte) (n int, err error) {
|
||||
// Parse the log level from the JSON log entry
|
||||
logLevel := extractLogLevel(p)
|
||||
|
||||
var writeErrors []error
|
||||
|
||||
// Write to console if log level meets console threshold
|
||||
if logLevel >= w.consoleLevel {
|
||||
if _, err := w.consoleWriter.Write(p); err != nil {
|
||||
writeErrors = append(writeErrors, err)
|
||||
}
|
||||
}
|
||||
|
||||
// Write to file if log level meets file threshold (always debug, so always write)
|
||||
if logLevel >= w.fileLevel {
|
||||
if _, err := w.fileWriter.Write(p); err != nil {
|
||||
writeErrors = append(writeErrors, err)
|
||||
}
|
||||
}
|
||||
|
||||
// Return the length of the original message and any write errors
|
||||
if len(writeErrors) > 0 {
|
||||
return len(p), writeErrors[0]
|
||||
}
|
||||
return len(p), nil
|
||||
}
|
||||
|
||||
// extractLogLevel extracts the log level from a JSON log entry
|
||||
func extractLogLevel(p []byte) zerolog.Level {
|
||||
// Simple parsing to extract level from JSON
|
||||
logStr := string(p)
|
||||
if strings.Contains(logStr, `"level":"debug"`) {
|
||||
return zerolog.DebugLevel
|
||||
} else if strings.Contains(logStr, `"level":"info"`) {
|
||||
return zerolog.InfoLevel
|
||||
} else if strings.Contains(logStr, `"level":"warn"`) {
|
||||
return zerolog.WarnLevel
|
||||
} else if strings.Contains(logStr, `"level":"error"`) {
|
||||
return zerolog.ErrorLevel
|
||||
} else if strings.Contains(logStr, `"level":"fatal"`) {
|
||||
return zerolog.FatalLevel
|
||||
} else if strings.Contains(logStr, `"level":"panic"`) {
|
||||
return zerolog.PanicLevel
|
||||
}
|
||||
return zerolog.InfoLevel // default
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user