add code

ethanvc · Jan 12, 2024 · 06d654b · 06d654b
1 parent 49ecb08
commit 06d654b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/evohttp/log_handler.go b/evohttp/log_handler.go
@@ -26,7 +26,7 @@ func (h *LogHandler) Handle(c context.Context, req any, info *RequestInfo, nexte
 		TraceId: info.Request.Header.Get("x-trace-id"),
 	})
 	resp, err = nexter.Next(c, req, info)
-	h.logger().Log(c, err, info.ParsedRequest, resp,
+	h.logger().LogWithSkip(c, 0, err, info.ParsedRequest, resp,
 		slog.Int("http_code", info.Writer.GetStatus()),
 		slog.String("path", info.Request.URL.Path),
 	)

diff --git a/httpcli/single_attempt.go b/httpcli/single_attempt.go
@@ -82,11 +82,7 @@ func (template *HttpTemplate) report(err error, sa *SingleAttempt, req, resp any
 		template.Report(err, sa, req, resp)
 		return
 	}
-	plog.DefaultRequestLogger().Log(sa.Request.Context(), &plog.RequestLogInfo{
-		Err:  err,
-		Req:  req,
-		Resp: resp,
-	}, slog.String("code", http.StatusText(sa.GetResponseCode())))
+	plog.DefaultRequestLogger().Log(sa.Request.Context(), err, req, resp, slog.String("code", http.StatusText(sa.GetResponseCode())))
 }
 
 func (template *HttpTemplate) realDo(req, resp any, sa *SingleAttempt) (err error) {

diff --git a/plog/request_logger.go b/plog/request_logger.go
@@ -25,6 +25,10 @@ func NewRequestLogger(
 }
 
 func (rl *RequestLogger) Log(c context.Context, err error, req, resp any, extra ...any) {
+	rl.LogWithSkip(c, 1, err, req, resp, extra...)
+}
+
+func (rl *RequestLogger) LogWithSkip(c context.Context, skip int, err error, req, resp any, extra ...any) {
 	s := base.Convert(err)
 	DefaultReporter().ReportRequest(c, s.GetCode(), s.GetEvent())
 	lvl := rl.callFilter(c, err, req, resp)
@@ -51,7 +55,7 @@ func (rl *RequestLogger) Log(c context.Context, err error, req, resp any, extra
 	if events := lc.GetEvents(); len(events) > 0 {
 		args = append(args, slog.String("events", events))
 	}
-	Log(c, lvl, 1, "REQ_END", args...)
+	Log(c, lvl, skip+1, "REQ_END", args...)
 }
 
 func (rl *RequestLogger) callFilter(c context.Context, err error, req, resp any) slog.Level {
@@ -108,5 +112,5 @@ func DefaultFilter(c context.Context, err error, req, resp any) slog.Level {
 }
 
 func RequestLog(c context.Context, err error, req, resp any, extra ...any) {
-	DefaultRequestLogger().Log(c, err, req, resp, extra...)
+	DefaultRequestLogger().LogWithSkip(c, 1, err, req, resp, extra...)
 }