for 200-400, and fix reuse

1set · Jul 22, 2024 · 7e5e9ce · 7e5e9ce
1 parent f6bca22
commit 7e5e9ce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/net/ping.go b/lib/net/ping.go
@@ -74,6 +74,12 @@ func httpPingFunc(ctx context.Context, url string, timeout time.Duration) (time.
 	// create a http client with timeout and tracing
 	client := &http.Client{
 		Timeout: timeout,
+		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse // do not follow redirects
+		},
+		Transport: &http.Transport{
+			DisableKeepAlives: true,
+		},
 	}
 	req, err := http.NewRequestWithContext(httptrace.WithClientTrace(ctx, trace), "GET", url, nil)
 	if err != nil {
@@ -86,7 +92,7 @@ func httpPingFunc(ctx context.Context, url string, timeout time.Duration) (time.
 		return 0, err
 	}
 	defer resp.Body.Close()
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+	if resp.StatusCode < 200 || resp.StatusCode >= 400 {
 		return 0, fmt.Errorf("unacceptable status: %d", resp.StatusCode)
 	}
 	return connDur, nil

diff --git a/lib/net/ping_test.go b/lib/net/ping_test.go
@@ -90,6 +90,7 @@ func TestLoadModule_Ping(t *testing.T) {
 				print(s)
 				assert.eq(s.total, 4)
 				assert.true(s.success > 0)
+				assert.true(s.min > 0)
 			`),
 		},
 		{
@@ -111,6 +112,7 @@ func TestLoadModule_Ping(t *testing.T) {
 				print(s)
 				assert.eq(s.total, 10)
 				assert.true(s.success > 0)
+				assert.true(s.min > 0)
 			`),
 		},
 		{