Skip to content

Commit 022c100

Browse files
authored
Add request method in http log (zeromicro#1120)
* Add request method in http log * Update log format
1 parent 426b09c commit 022c100

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

rest/handler/loghandler.go

+13-11
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,12 @@ func dumpRequest(r *http.Request) string {
152152
func logBrief(r *http.Request, code int, timer *utils.ElapsedTimer, logs *internal.LogCollector) {
153153
var buf bytes.Buffer
154154
duration := timer.Duration()
155-
buf.WriteString(fmt.Sprintf("%d - %s - %s - %s - %s",
156-
code, r.RequestURI, httpx.GetRemoteAddr(r), r.UserAgent(), timex.ReprOfDuration(duration)))
155+
logger := logx.WithContext(r.Context())
156+
buf.WriteString(fmt.Sprintf("[HTTP] %s - %d - %s - %s - %s - %s",
157+
r.Method, code, r.RequestURI, httpx.GetRemoteAddr(r), r.UserAgent(), timex.ReprOfDuration(duration)))
157158
if duration > slowThreshold {
158-
logx.WithContext(r.Context()).Slowf("[HTTP] %d - %s - %s - %s - slowcall(%s)",
159-
code, r.RequestURI, httpx.GetRemoteAddr(r), r.UserAgent(), timex.ReprOfDuration(duration))
159+
logger.Slowf("[HTTP] %s - %d - %s - %s - %s - slowcall(%s)",
160+
r.Method, code, r.RequestURI, httpx.GetRemoteAddr(r), r.UserAgent(), timex.ReprOfDuration(duration))
160161
}
161162

162163
ok := isOkResponse(code)
@@ -177,21 +178,22 @@ func logBrief(r *http.Request, code int, timer *utils.ElapsedTimer, logs *intern
177178
}
178179

179180
if ok {
180-
logx.WithContext(r.Context()).Info(buf.String())
181+
logger.Info(buf.String())
181182
} else {
182-
logx.WithContext(r.Context()).Error(buf.String())
183+
logger.Error(buf.String())
183184
}
184185
}
185186

186187
func logDetails(r *http.Request, response *detailLoggedResponseWriter, timer *utils.ElapsedTimer,
187188
logs *internal.LogCollector) {
188189
var buf bytes.Buffer
189190
duration := timer.Duration()
190-
buf.WriteString(fmt.Sprintf("%d - %s - %s\n=> %s\n",
191-
response.writer.code, r.RemoteAddr, timex.ReprOfDuration(duration), dumpRequest(r)))
191+
logger := logx.WithContext(r.Context())
192+
buf.WriteString(fmt.Sprintf("[HTTP] %s - %d - %s - %s\n=> %s\n",
193+
r.Method, response.writer.code, r.RemoteAddr, timex.ReprOfDuration(duration), dumpRequest(r)))
192194
if duration > slowThreshold {
193-
logx.WithContext(r.Context()).Slowf("[HTTP] %d - %s - slowcall(%s)\n=> %s\n",
194-
response.writer.code, r.RemoteAddr, timex.ReprOfDuration(duration), dumpRequest(r))
195+
logger.Slowf("[HTTP] %s - %d - %s - slowcall(%s)\n=> %s\n",
196+
r.Method, response.writer.code, r.RemoteAddr, timex.ReprOfDuration(duration), dumpRequest(r))
195197
}
196198

197199
body := logs.Flush()
@@ -204,7 +206,7 @@ func logDetails(r *http.Request, response *detailLoggedResponseWriter, timer *ut
204206
buf.WriteString(fmt.Sprintf("<= %s", respBuf))
205207
}
206208

207-
logx.WithContext(r.Context()).Info(buf.String())
209+
logger.Info(buf.String())
208210
}
209211

210212
func isOkResponse(code int) bool {

0 commit comments

Comments
 (0)