misc: fixes

kevindweb · Dec 30, 2024 · 0f2f97c · 0f2f97c
1 parent 70305d7
commit 0f2f97c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/proxymw/middleware.go b/proxymw/middleware.go
@@ -158,8 +158,12 @@ func NewFromConfig(cfg Config, client ProxyClient) ProxyClient {
 
 // ServeHTTP processes requests through the middleware chain
 func (se *ServeEntry) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	ctx, cancel := context.WithTimeout(r.Context(), se.timeout)
-	defer cancel()
+	ctx := r.Context()
+	if se.timeout > 0 {
+		var cancel func()
+		ctx, cancel = context.WithTimeout(ctx, se.timeout)
+		defer cancel()
+	}
 
 	rr := &RequestResponseWrapper{
 		w:   w,

diff --git a/proxyutil/flag.go b/proxyutil/flag.go
@@ -158,7 +158,7 @@ func ParseConfigFlags() (Config, error) {
 		return Config{}, err
 	}
 
-	queries, err := parseBackpressureQueries(
+	queries, err := ParseBackpressureQueries(
 		bpQueries, bpQueryNames, bpWarnThresholds, bpEmergencyThresholds,
 	)
 	if err != nil {
@@ -282,7 +282,7 @@ func parsePaths(paths string) ([]string, error) {
 	return pathList, nil
 }
 
-func parseBackpressureQueries(
+func ParseBackpressureQueries(
 	bpQueries, bpQueryNames []string, bpWarnThresholds, bpEmergencyThresholds []float64,
 ) ([]proxymw.BackpressureQuery, error) {
 	n := len(bpQueries)