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

hotfix(custom): allow empty servers data

Browse Source
This commit is contained in:
Quentin McGaw
2022-05-27 21:47:41 +00:00
parent a91eb95456
commit 67a9cacb61
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/configuration/settings/serverselection.go
View File

@@ -141,7 +141,7 @@ func getLocationFilterChoices(vpnServiceProvider string, ss *ServerSelection,
ispChoices, nameChoices, hostnameChoices []string, ispChoices, nameChoices, hostnameChoices []string,
err error) { err error) {
providerServers, ok := allServers.ProviderToServers[vpnServiceProvider] providerServers, ok := allServers.ProviderToServers[vpnServiceProvider]
if !ok { if !ok && vpnServiceProvider != providers.Custom {
panic(fmt.Sprintf("VPN service provider unknown: %s", vpnServiceProvider)) panic(fmt.Sprintf("VPN service provider unknown: %s", vpnServiceProvider))
} }
servers := providerServers.Servers servers := providerServers.Servers

4
internal/models/servers.go
View File

@@ -16,6 +16,10 @@ type AllServers struct {
} }
func (a *AllServers) ServersSlice(provider string) []Server { func (a *AllServers) ServersSlice(provider string) []Server {
if provider == providers.Custom {
return nil
}
servers, ok := a.ProviderToServers[provider] servers, ok := a.ProviderToServers[provider]
if !ok { if !ok {
panic(fmt.Sprintf("provider %s not found in all servers", provider)) panic(fmt.Sprintf("provider %s not found in all servers", provider))