MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-25 06:35:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect request start time (#10516)

Browse Source 
Log request start time BEFORE starting processing the request
This commit is contained in:
Klaus Post 2020-09-18 09:30:52 -07:00 committed by GitHub
parent c851e022b7
commit 0b1c824618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/http-tracer.go
View File

@ -121,11 +121,6 @@ func Trace(f http.HandlerFunc, logBody bool, w http.ResponseWriter, r *http.Requ
t.NodeName = host t.NodeName = host
} }
rw := logger.NewResponseWriter(w)
rw.LogErrBody = true
rw.LogAllBody = logBody
f(rw, r)
rq := trace.RequestInfo{ rq := trace.RequestInfo{
Time: time.Now().UTC(), Time: time.Now().UTC(),
Proto: r.Proto, Proto: r.Proto,
@ -134,8 +129,15 @@ func Trace(f http.HandlerFunc, logBody bool, w http.ResponseWriter, r *http.Requ
RawQuery: r.URL.RawQuery, RawQuery: r.URL.RawQuery,
Client: handlers.GetSourceIP(r), Client: handlers.GetSourceIP(r),
Headers: reqHeaders, Headers: reqHeaders,
Body: reqBodyRecorder.Data(),
} }
rw := logger.NewResponseWriter(w)
rw.LogErrBody = true
rw.LogAllBody = logBody
// Execute call.
f(rw, r)
rs := trace.ResponseInfo{ rs := trace.ResponseInfo{
Time: time.Now().UTC(), Time: time.Now().UTC(),
Headers: rw.Header().Clone(), Headers: rw.Header().Clone(),
@ -143,6 +145,9 @@ func Trace(f http.HandlerFunc, logBody bool, w http.ResponseWriter, r *http.Requ
Body: rw.Body(), Body: rw.Body(),
} }
// Transfer request body
rq.Body = reqBodyRecorder.Data()
if rs.StatusCode == 0 { if rs.StatusCode == 0 {
rs.StatusCode = http.StatusOK rs.StatusCode = http.StatusOK
} }