chore(updater): create resolver in provider updater
- Pass min servers to resolve call - Set settings when constructing resolver - Construct resolver in each provider updater - No more common resolver for all providers
This commit is contained in:
@@ -1,16 +1,12 @@
|
||||
package cyberghost
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net"
|
||||
"time"
|
||||
|
||||
"github.com/qdm12/gluetun/internal/updater/resolver"
|
||||
)
|
||||
|
||||
func resolveHosts(ctx context.Context, presolver resolver.Parallel,
|
||||
possibleHosts []string, minServers int) (
|
||||
hostToIPs map[string][]net.IP, err error) {
|
||||
func newParallelResolver() (parallelResolver resolver.Parallel) {
|
||||
const (
|
||||
maxFailRatio = 1
|
||||
maxDuration = 20 * time.Second
|
||||
@@ -20,7 +16,6 @@ func resolveHosts(ctx context.Context, presolver resolver.Parallel,
|
||||
)
|
||||
settings := resolver.ParallelSettings{
|
||||
MaxFailRatio: maxFailRatio,
|
||||
MinFound: minServers,
|
||||
Repeat: resolver.RepeatSettings{
|
||||
MaxDuration: maxDuration,
|
||||
BetweenDuration: betweenDuration,
|
||||
@@ -29,10 +24,5 @@ func resolveHosts(ctx context.Context, presolver resolver.Parallel,
|
||||
SortIPs: true,
|
||||
},
|
||||
}
|
||||
hostToIPs, _, err = presolver.Resolve(ctx, possibleHosts, settings)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return hostToIPs, nil
|
||||
return resolver.NewParallelResolver(settings)
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
|
||||
possibleServers := getPossibleServers()
|
||||
|
||||
possibleHosts := possibleServers.hostsSlice()
|
||||
hostToIPs, err := resolveHosts(ctx, u.presolver, possibleHosts, minServers)
|
||||
hostToIPs, _, err := u.presolver.Resolve(ctx, possibleHosts, minServers)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -6,8 +6,8 @@ type Updater struct {
|
||||
presolver resolver.Parallel
|
||||
}
|
||||
|
||||
func New(presolver resolver.Parallel) *Updater {
|
||||
func New() *Updater {
|
||||
return &Updater{
|
||||
presolver: presolver,
|
||||
presolver: newParallelResolver(),
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user