self-hosted/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-12-13 23:57:38 +02:00
Code Issues Releases Activity

New logging; JSON and structured log formats

Browse Source
This commit is contained in:
DarthSim
2019-09-16 15:53:45 +06:00
parent 83c00a9e2b
commit 16784fb1e2
13 changed files with 322 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
processing_handler.go
View File

@@ -83,11 +83,22 @@ func respondWithImage(ctx context.Context, reqID string, r *http.Request, rw htt
rw.Write(data)
}
logResponse(reqID, 200, fmt.Sprintf("Processed in %s: %s; %+v", getTimerSince(ctx), getImageURL(ctx), po))
imageURL := getImageURL(ctx)
logResponse(reqID, r, 200, nil, &imageURL, po)
// logResponse(reqID, r, 200, getTimerSince(ctx), getImageURL(ctx), po))
}
func respondWithNotModified(ctx context.Context, reqID string, r *http.Request, rw http.ResponseWriter) {
rw.WriteHeader(304)
imageURL := getImageURL(ctx)
logResponse(reqID, r, 304, nil, &imageURL, getProcessingOptions(ctx))
}
func handleProcessing(reqID string, rw http.ResponseWriter, r *http.Request) {
ctx := context.Background()
ctx := r.Context()
if newRelicEnabled {
var newRelicCancel context.CancelFunc
@@ -103,7 +114,7 @@ func handleProcessing(reqID string, rw http.ResponseWriter, r *http.Request) {
processingSem <- struct{}{}
defer func() { <-processingSem }()
ctx, timeoutCancel := startTimer(ctx, time.Duration(conf.WriteTimeout)*time.Second)
ctx, timeoutCancel := context.WithTimeout(ctx, time.Duration(conf.WriteTimeout)*time.Second)
defer timeoutCancel()
ctx, err := parsePath(ctx, r)
@@ -130,8 +141,7 @@ func handleProcessing(reqID string, rw http.ResponseWriter, r *http.Request) {
rw.Header().Set("ETag", eTag)
if eTag == r.Header.Get("If-None-Match") {
logResponse(reqID, 304, "Not modified")
rw.WriteHeader(304)
respondWithNotModified(ctx, reqID, r, rw)
return
}
}