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

Maint: use VPN settings instead of OpenVPN in loop

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2021-08-18 21:27:09 +00:00
parent 538bc72c3c
commit 05018ec971
7 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/openvpn/state/openvpn.go
View File

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