Fix: when both providers and proxies are present, use the health check configuration for proxies (#1821)

Co-authored-by: Ho <ho@fluidex.com>
This commit is contained in:
Fan 2021-12-12 20:37:30 +08:00 committed by GitHub
parent 78e105f3b2
commit ee6fc12709
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -59,16 +59,6 @@ func ParseProxyGroup(config map[string]interface{}, proxyMap map[string]C.Proxy,
return nil, err
}
// if Use not empty, drop health check options
if len(groupOption.Use) != 0 {
hc := provider.NewHealthCheck(ps, "", 0, true)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err
}
providers = append(providers, pd)
} else {
if _, ok := providersMap[groupName]; ok {
return nil, errDuplicateProvider
}
@ -98,7 +88,6 @@ func ParseProxyGroup(config map[string]interface{}, proxyMap map[string]C.Proxy,
providersMap[groupName] = pd
}
}
}
if len(groupOption.Use) != 0 {
list, err := getProviders(providersMap, groupOption.Use)