go/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-03-27 20:30:27 +02:00
Code Releases Activity

Start requiest timer in router

Browse Source
This commit is contained in:
DarthSim 2022-01-14 00:18:48 +06:00
parent 86b646fe1b
commit e43c24c544
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
processing_handler.go
View File

@ -1,7 +1,6 @@
package main
import (
"context"
"fmt"
"net/http"
"net/http/cookiejar"
@ -138,11 +137,7 @@ func respondWithNotModified(reqID string, r *http.Request, rw http.ResponseWrite
}
func handleProcessing(reqID string, rw http.ResponseWriter, r *http.Request) {
ctx, timeoutCancel := context.WithTimeout(r.Context(), time.Duration(config.WriteTimeout)*time.Second)
defer timeoutCancel()
var metricsCancel context.CancelFunc
ctx, metricsCancel, rw = metrics.StartRequest(ctx, rw, r)
ctx, metricsCancel, rw := metrics.StartRequest(r.Context(), rw, r)
defer metricsCancel()
path := r.RequestURI

3
router/router.go
View File

@ -71,7 +71,8 @@ func (r *Router) HEAD(prefix string, handler RouteHandler, exact bool) {
}
func (r *Router) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
req = setRequestTime(req)
req, timeoutCancel := startRequestTimer(req)
defer timeoutCancel()
reqID := req.Header.Get(xRequestIDHeader)

10
router/timer.go
View File

@ -6,16 +6,18 @@ import (
"net/http"
"time"
"github.com/imgproxy/imgproxy/v3/config"
"github.com/imgproxy/imgproxy/v3/ierrors"
"github.com/imgproxy/imgproxy/v3/metrics"
)
type timerSinceCtxKey = struct{}
func setRequestTime(r *http.Request) *http.Request {
return r.WithContext(
context.WithValue(r.Context(), timerSinceCtxKey{}, time.Now()),
)
func startRequestTimer(r *http.Request) (*http.Request, context.CancelFunc) {
ctx := r.Context()
ctx = context.WithValue(ctx, timerSinceCtxKey{}, time.Now())
ctx, cancel := context.WithTimeout(ctx, time.Duration(config.WriteTimeout)*time.Second)
return r.WithContext(ctx), cancel
}
func ctxTime(ctx context.Context) time.Duration {