From 3d643cb95a32e0cef69c4411af9655fa0ee6851a Mon Sep 17 00:00:00 2001 From: xishang0128 Date: Sun, 31 Dec 2023 07:39:17 +0800 Subject: [PATCH] chore: modify default url --- adapter/outboundgroup/parser.go | 10 +++++----- adapter/provider/healthcheck.go | 5 ++--- adapter/provider/parser.go | 3 +++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/adapter/outboundgroup/parser.go b/adapter/outboundgroup/parser.go index ea1b51e1..c23147d7 100644 --- a/adapter/outboundgroup/parser.go +++ b/adapter/outboundgroup/parser.go @@ -82,6 +82,11 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide groupOption.ExpectedStatus = status testUrl := groupOption.URL + if groupOption.URL == "" { + groupOption.URL = C.DefaultTestURL + testUrl = groupOption.URL + } + if len(groupOption.Proxies) != 0 { ps, err := getProxies(proxyMap, groupOption.Proxies) if err != nil { @@ -94,11 +99,6 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide // select don't need health check if groupOption.Type != "select" && groupOption.Type != "relay" { - if groupOption.URL == "" { - groupOption.URL = C.DefaultTestURL - testUrl = groupOption.URL - } - if groupOption.Interval == 0 { groupOption.Interval = 300 } diff --git a/adapter/provider/healthcheck.go b/adapter/provider/healthcheck.go index d8e56192..12e1df42 100644 --- a/adapter/provider/healthcheck.go +++ b/adapter/provider/healthcheck.go @@ -213,9 +213,8 @@ func (hc *HealthCheck) close() { } func NewHealthCheck(proxies []C.Proxy, url string, interval uint, lazy bool, expectedStatus utils.IntRanges[uint16]) *HealthCheck { - if len(url) == 0 { - interval = 0 - expectedStatus = nil + if url == "" { + // expectedStatus = nil url = C.DefaultTestURL } diff --git a/adapter/provider/parser.go b/adapter/provider/parser.go index 90d7482c..c78a9d39 100644 --- a/adapter/provider/parser.go +++ b/adapter/provider/parser.go @@ -70,6 +70,9 @@ func ParseProxyProvider(name string, mapping map[string]any) (types.ProxyProvide var hcInterval uint if schema.HealthCheck.Enable { + if schema.HealthCheck.Interval == 0 { + schema.HealthCheck.Interval = 300 + } hcInterval = uint(schema.HealthCheck.Interval) } hc := NewHealthCheck([]C.Proxy{}, schema.HealthCheck.URL, hcInterval, schema.HealthCheck.Lazy, expectedStatus)