@@ -152,11 +152,12 @@ func dumpRequest(r *http.Request) string {
152
152
func logBrief (r * http.Request , code int , timer * utils.ElapsedTimer , logs * internal.LogCollector ) {
153
153
var buf bytes.Buffer
154
154
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 )))
157
158
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 ))
160
161
}
161
162
162
163
ok := isOkResponse (code )
@@ -177,21 +178,22 @@ func logBrief(r *http.Request, code int, timer *utils.ElapsedTimer, logs *intern
177
178
}
178
179
179
180
if ok {
180
- logx . WithContext ( r . Context ()) .Info (buf .String ())
181
+ logger .Info (buf .String ())
181
182
} else {
182
- logx . WithContext ( r . Context ()) .Error (buf .String ())
183
+ logger .Error (buf .String ())
183
184
}
184
185
}
185
186
186
187
func logDetails (r * http.Request , response * detailLoggedResponseWriter , timer * utils.ElapsedTimer ,
187
188
logs * internal.LogCollector ) {
188
189
var buf bytes.Buffer
189
190
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 )))
192
194
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 ))
195
197
}
196
198
197
199
body := logs .Flush ()
@@ -204,7 +206,7 @@ func logDetails(r *http.Request, response *detailLoggedResponseWriter, timer *ut
204
206
buf .WriteString (fmt .Sprintf ("<= %s" , respBuf ))
205
207
}
206
208
207
- logx . WithContext ( r . Context ()) .Info (buf .String ())
209
+ logger .Info (buf .String ())
208
210
}
209
211
210
212
func isOkResponse (code int ) bool {
0 commit comments