revert: "modify default url"

This reverts commit 3d643cb.
xishang0128 · Feb 21, 2024 · a37548c · a37548c
1 parent f8295a0
commit a37548c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/adapter/outboundgroup/parser.go b/adapter/outboundgroup/parser.go
@@ -93,13 +93,6 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 	groupOption.ExpectedStatus = status
 	testUrl := groupOption.URL
 
-	if groupOption.Type != "select" && groupOption.Type != "relay" {
-		if groupOption.URL == "" {
-			groupOption.URL = C.DefaultTestURL
-			testUrl = groupOption.URL
-		}
-	}
-
 	if len(GroupProxies) != 0 {
 		ps, err := getProxies(proxyMap, GroupProxies)
 		if err != nil {
@@ -115,6 +108,10 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 			if groupOption.Interval == 0 {
 				groupOption.Interval = 300
 			}
+			if groupOption.URL == "" {
+				groupOption.URL = C.DefaultTestURL
+				testUrl = groupOption.URL
+			}
 		}
 
 		hc := provider.NewHealthCheck(ps, testUrl, uint(groupOption.TestTimeout), uint(groupOption.Interval), groupOption.Lazy, expectedStatus)

diff --git a/adapter/provider/healthcheck.go b/adapter/provider/healthcheck.go
@@ -211,8 +211,8 @@ func (hc *HealthCheck) close() {
 
 func NewHealthCheck(proxies []C.Proxy, url string, timeout uint, interval uint, lazy bool, expectedStatus utils.IntRanges[uint16]) *HealthCheck {
 	if url == "" {
-		// expectedStatus = nil
-		url = C.DefaultTestURL
+		expectedStatus = nil
+		interval = 0
 	}
 	if timeout == 0 {
 		timeout = 5000