MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-03 18:06:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(AuditLog): panic while st is nil (#13510)

Browse Source
This commit is contained in:
moon 2021-10-28 00:29:42 +08:00 committed by GitHub
parent 939fbb3c38
commit d158607f8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/logger/audit.go
View File

@ -26,6 +26,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/klauspost/compress/gzhttp"
"github.com/minio/minio/internal/logger/message/audit" "github.com/minio/minio/internal/logger/message/audit"
) )
@ -183,13 +184,24 @@ func AuditLog(ctx context.Context, w http.ResponseWriter, r *http.Request, reqCl
statusCode int statusCode int
timeToResponse time.Duration timeToResponse time.Duration
timeToFirstByte time.Duration timeToFirstByte time.Duration
outputBytes int64 = -1 // -1: unknown output bytes
) )
st, ok := w.(*ResponseWriter) var st *ResponseWriter
if ok { switch v := w.(type) {
case *ResponseWriter:
st = v
case *gzhttp.GzipResponseWriter:
// the writer may be obscured by gzip response writer
if rw, ok := v.ResponseWriter.(*ResponseWriter); ok {
st = rw
}
}
if st != nil {
statusCode = st.StatusCode statusCode = st.StatusCode
timeToResponse = time.Now().UTC().Sub(st.StartTime) timeToResponse = time.Now().UTC().Sub(st.StartTime)
timeToFirstByte = st.TimeToFirstByte timeToFirstByte = st.TimeToFirstByte
outputBytes = int64(st.Size())
} }
entry.API.Name = reqInfo.API entry.API.Name = reqInfo.API
@ -198,7 +210,7 @@ func AuditLog(ctx context.Context, w http.ResponseWriter, r *http.Request, reqCl
entry.API.Status = http.StatusText(statusCode) entry.API.Status = http.StatusText(statusCode)
entry.API.StatusCode = statusCode entry.API.StatusCode = statusCode
entry.API.InputBytes = r.ContentLength entry.API.InputBytes = r.ContentLength
entry.API.OutputBytes = int64(st.Size()) entry.API.OutputBytes = outputBytes
entry.API.TimeToResponse = strconv.FormatInt(timeToResponse.Nanoseconds(), 10) + "ns" entry.API.TimeToResponse = strconv.FormatInt(timeToResponse.Nanoseconds(), 10) + "ns"
entry.Tags = reqInfo.GetTagsMap() entry.Tags = reqInfo.GetTagsMap()
// ttfb will be recorded only for GET requests, Ignore such cases where ttfb will be empty. // ttfb will be recorded only for GET requests, Ignore such cases where ttfb will be empty.