Compare commits

..

No commits in common. "9d7fea4d82a52e14b2b32b73e284fd3349ac0e27" and "5670f87f64825a0616e4c3afd87a43feaaa91c26" have entirely different histories.

2 changed files with 5 additions and 7 deletions

View File

@ -45,7 +45,7 @@ func GinLogger(logfile string) gin.HandlerFunc {
} }
if requestID := c.Writer.Header().Get("X-Request-Id"); requestID != "" { if requestID := c.Writer.Header().Get("X-Request-Id"); requestID != "" {
// logger.With(logger.String("reqId", requestID)) // logger.With(logger.String("reqId", requestID))
fields = append([]logger.Field{logger.String("reqId", requestID)}, fields...) fields = append(fields, logger.String("reqId", requestID))
} }
log.Info("GIN request", fields...) log.Info("GIN request", fields...)

View File

@ -10,7 +10,6 @@ package logger
import ( import (
"fmt" "fmt"
"io" "io"
"net/http"
"os" "os"
"go.uber.org/zap" "go.uber.org/zap"
@ -97,12 +96,11 @@ func ReplaceDefault(l *Logger) { std = l }
func SetLevel(level Level) { std.SetLevel(level) } func SetLevel(level Level) { std.SetLevel(level) }
func WithTarget(target string) Field { func With(fields ...Field) {
return String("target", target) std.l.Core().With(fields)
} }
func WithRequestId(reqId string) {
func WithRequestId(req *http.Request) Field { std.l.Core().With([]Field{String("reqId", reqId)})
return String("reqId", req.Header.Get("X-Request-ID"))
} }
func Debug(msg string, fields ...Field) { std.Debug(msg, fields...) } func Debug(msg string, fields ...Field) { std.Debug(msg, fields...) }