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

fix(cyberghost): log warnings from updater resolver

Browse Source
This commit is contained in:
Quentin McGaw
2025-11-04 14:42:54 +00:00
parent 7fbc5c3c07
commit 43da9ddbb3
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/provider/cyberghost/provider.go
View File

@@ -15,12 +15,12 @@ type Provider struct {
} }
func New(storage common.Storage, randSource rand.Source, func New(storage common.Storage, randSource rand.Source,
parallelResolver common.ParallelResolver, updaterWarner common.Warner, parallelResolver common.ParallelResolver,
) *Provider { ) *Provider {
return &Provider{ return &Provider{
storage: storage, storage: storage,
randSource: randSource, randSource: randSource,
Fetcher: updater.New(parallelResolver), Fetcher: updater.New(parallelResolver, updaterWarner),
} }
} }

5
internal/provider/cyberghost/updater/servers.go
View File

@@ -16,7 +16,10 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
possibleHosts := possibleServers.hostsSlice() possibleHosts := possibleServers.hostsSlice()
resolveSettings := parallelResolverSettings(possibleHosts) resolveSettings := parallelResolverSettings(possibleHosts)
hostToIPs, _, err := u.parallelResolver.Resolve(ctx, resolveSettings) hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
for _, warning := range warnings {
u.warner.Warn(warning)
}
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
internal/provider/cyberghost/updater/updater.go
View File

@@ -6,10 +6,12 @@ import (
type Updater struct { type Updater struct {
parallelResolver common.ParallelResolver parallelResolver common.ParallelResolver
warner common.Warner
} }
func New(parallelResolver common.ParallelResolver) *Updater { func New(parallelResolver common.ParallelResolver, warner common.Warner) *Updater {
return &Updater{ return &Updater{
parallelResolver: parallelResolver, parallelResolver: parallelResolver,
warner: warner,
} }
} }

2
internal/provider/providers.go
View File

@@ -62,7 +62,7 @@ func NewProviders(storage Storage, timeNow func() time.Time,
providerNameToProvider := map[string]Provider{ providerNameToProvider := map[string]Provider{
providers.Airvpn: airvpn.New(storage, randSource, client), providers.Airvpn: airvpn.New(storage, randSource, client),
providers.Custom: custom.New(extractor), providers.Custom: custom.New(extractor),
providers.Cyberghost: cyberghost.New(storage, randSource, parallelResolver), providers.Cyberghost: cyberghost.New(storage, randSource, updaterWarner, parallelResolver),
providers.Expressvpn: expressvpn.New(storage, randSource, unzipper, updaterWarner, parallelResolver), providers.Expressvpn: expressvpn.New(storage, randSource, unzipper, updaterWarner, parallelResolver),
providers.Fastestvpn: fastestvpn.New(storage, randSource, client, updaterWarner, parallelResolver), providers.Fastestvpn: fastestvpn.New(storage, randSource, client, updaterWarner, parallelResolver),
providers.Giganews: giganews.New(storage, randSource, unzipper, updaterWarner, parallelResolver), providers.Giganews: giganews.New(storage, randSource, unzipper, updaterWarner, parallelResolver),