fix error on missing high_drift

sapcc · Sep 27, 2024 · b69c5f1 · b69c5f1
1 parent 3d3d746
commit b69c5f1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
-## v2.8.0 - TBD
+## v2.7.1 - TBD
 
 Changes:
+- Fix a server error being returned if the optional `high_drift` parameter is not given.
 
 ## v2.7.0 - 2024-09-10
 

diff --git a/main.go b/main.go
@@ -123,15 +123,17 @@ func handlerMetrics(w http.ResponseWriter, r *http.Request) {
 		if t, err := time.ParseDuration(r.URL.Query().Get("duration")); err == nil {
 			d = t
 		} else {
-			http.Error(w, err.Error(), http.StatusBadRequest)
+			http.Error(w, "while parsing duration: "+err.Error(), http.StatusBadRequest)
 			return
 		}
 
-		if u, err := time.ParseDuration(r.URL.Query().Get("high_drift")); err == nil {
-			hd = u
-		} else {
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
+		if r.URL.Query().Get("high_drift") != "" {
+			if u, err := time.ParseDuration(r.URL.Query().Get("high_drift")); err == nil {
+				hd = u
+			} else {
+				http.Error(w, "while parsing high_drift: "+err.Error(), http.StatusBadRequest)
+				return
+			}
 		}
 	}