admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(updater): shared not enough servers error

Browse Source
This commit is contained in:
Quentin McGaw
2022-05-28 22:02:18 +00:00
parent eb18eaf0a9
commit 22455ac76f
20 changed files with 60 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/provider/ipvanish/updater/servers.go
View File

@@ -4,18 +4,16 @@ package ipvanish
import (
"context"
"errors"
"fmt"
"strings"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/provider/common"
"github.com/qdm12/gluetun/internal/updater/openvpn"
"golang.org/x/text/cases"
"golang.org/x/text/language"
)
var ErrNotEnoughServers = errors.New("not enough servers found")
func (u *Updater) GetServers(ctx context.Context, minServers int) (
servers []models.Server, err error) {
const url = "https://www.ipvanish.com/software/configs/configs.zip"
@@ -24,7 +22,7 @@ func (u *Updater) GetServers(ctx context.Context, minServers int) (
return nil, err
} else if len(contents) < minServers {
return nil, fmt.Errorf("%w: %d and expected at least %d",
ErrNotEnoughServers, len(contents), minServers)
common.ErrNotEnoughServers, len(contents), minServers)
}
hts := make(hostToServer)
@@ -64,7 +62,7 @@ func (u *Updater) GetServers(ctx context.Context, minServers int) (
if len(hts) < minServers {
return nil, fmt.Errorf("%w: %d and expected at least %d",
ErrNotEnoughServers, len(hts), minServers)
common.ErrNotEnoughServers, len(hts), minServers)
}
hosts := hts.toHostsSlice()
@@ -82,7 +80,7 @@ func (u *Updater) GetServers(ctx context.Context, minServers int) (
if len(servers) < minServers {
return nil, fmt.Errorf("%w: %d and expected at least %d",
ErrNotEnoughServers, len(servers), minServers)
common.ErrNotEnoughServers, len(servers), minServers)
}
sortServers(servers)