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

Maint: simplify settings code in internal/vpn

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2021-08-19 14:57:11 +00:00
parent 9218c7ef19
commit 5c2286f4e8
8 changed files with 31 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/vpn/state/state.go
View File

@@ -13,17 +13,14 @@ var _ Manager = (*State)(nil)
type Manager interface {
SettingsGetSetter
ServersGetterSetter
GetSettingsAndServers() (vpn configuration.VPN,
provider configuration.Provider, allServers models.AllServers)
GetSettingsAndServers() (vpn configuration.VPN, allServers models.AllServers)
}
func New(statusApplier loopstate.Applier,
vpn configuration.VPN, provider configuration.Provider,
allServers models.AllServers) *State {
vpn configuration.VPN, allServers models.AllServers) *State {
return &State{
statusApplier: statusApplier,
vpn: vpn,
provider: provider,
allServers: allServers,
}
}
@@ -32,7 +29,6 @@ type State struct {
statusApplier loopstate.Applier
vpn configuration.VPN
provider configuration.Provider
settingsMu sync.RWMutex
allServers models.AllServers
@@ -40,13 +36,12 @@ type State struct {
}
func (s *State) GetSettingsAndServers() (vpn configuration.VPN,
provider configuration.Provider, allServers models.AllServers) {
allServers models.AllServers) {
s.settingsMu.RLock()
s.allServersMu.RLock()
vpn = s.vpn
provider = s.provider
allServers = s.allServers
s.settingsMu.RUnlock()
s.allServersMu.RUnlock()
return vpn, provider, allServers
return vpn, allServers
}

19
internal/vpn/state/vpn.go
View File

@@ -9,33 +9,26 @@ import (
)
type SettingsGetSetter interface {
GetSettings() (vpn configuration.VPN,
provider configuration.Provider)
SetSettings(ctx context.Context, vpn configuration.VPN,
provider configuration.Provider) (outcome string)
GetSettings() (vpn configuration.VPN)
SetSettings(ctx context.Context, vpn configuration.VPN) (outcome string)
}
func (s *State) GetSettings() (vpn configuration.VPN,
provider configuration.Provider) {
func (s *State) GetSettings() (vpn configuration.VPN) {
s.settingsMu.RLock()
vpn = s.vpn
provider = s.provider
s.settingsMu.RUnlock()
return vpn, provider
return vpn
}
func (s *State) SetSettings(ctx context.Context,
vpn configuration.VPN, provider configuration.Provider) (
func (s *State) SetSettings(ctx context.Context, vpn configuration.VPN) (
outcome string) {
s.settingsMu.Lock()
settingsUnchanged := reflect.DeepEqual(s.vpn, vpn) &&
reflect.DeepEqual(s.provider, provider)
settingsUnchanged := reflect.DeepEqual(s.vpn, vpn)
if settingsUnchanged {
s.settingsMu.Unlock()
return "settings left unchanged"
}
s.vpn = vpn
s.provider = provider
s.settingsMu.Unlock()
_, _ = s.statusApplier.ApplyStatus(ctx, constants.Stopped)
outcome, _ = s.statusApplier.ApplyStatus(ctx, constants.Running)