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

chore(settings): refactor settings processing (#756)

Browse Source 
- Better settings tree structure logged using `qdm12/gotree`
- Read settings from environment variables, then files, then secret files
- Settings methods to default them, merge them and override them
- `DNS_PLAINTEXT_ADDRESS` default changed to `127.0.0.1` to use DoT. Warning added if set to something else.
- `HTTPPROXY_LISTENING_ADDRESS` instead of `HTTPPROXY_PORT` (with retro-compatibility)
This commit is contained in:
Quentin McGaw
2022-01-06 06:40:23 -05:00
committed by GitHub
parent 46738b2934
commit 7d824a5179
275 changed files with 7167 additions and 6328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@ package state
import (
"sync"
"github.com/qdm12/gluetun/internal/configuration"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/loopstate"
"github.com/qdm12/gluetun/internal/models"
)
@@ -13,11 +13,11 @@ var _ Manager = (*State)(nil)
type Manager interface {
SettingsGetSetter
ServersGetterSetter
GetSettingsAndServers() (vpn configuration.VPN, allServers models.AllServers)
GetSettingsAndServers() (vpn settings.VPN, allServers models.AllServers)
}
func New(statusApplier loopstate.Applier,
vpn configuration.VPN, allServers models.AllServers) *State {
vpn settings.VPN, allServers models.AllServers) *State {
return &State{
statusApplier: statusApplier,
vpn: vpn,
@@ -28,14 +28,14 @@ func New(statusApplier loopstate.Applier,
type State struct {
statusApplier loopstate.Applier
vpn configuration.VPN
vpn settings.VPN
settingsMu sync.RWMutex
allServers models.AllServers
allServersMu sync.RWMutex
}
func (s *State) GetSettingsAndServers() (vpn configuration.VPN,
func (s *State) GetSettingsAndServers() (vpn settings.VPN,
allServers models.AllServers) {
s.settingsMu.RLock()
s.allServersMu.RLock()

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

@@ -4,23 +4,23 @@ import (
"context"
"reflect"
"github.com/qdm12/gluetun/internal/configuration"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/constants"
)
type SettingsGetSetter interface {
GetSettings() (vpn configuration.VPN)
SetSettings(ctx context.Context, vpn configuration.VPN) (outcome string)
GetSettings() (vpn settings.VPN)
SetSettings(ctx context.Context, vpn settings.VPN) (outcome string)
}
func (s *State) GetSettings() (vpn configuration.VPN) {
func (s *State) GetSettings() (vpn settings.VPN) {
s.settingsMu.RLock()
vpn = s.vpn
s.settingsMu.RUnlock()
return vpn
}
func (s *State) SetSettings(ctx context.Context, vpn configuration.VPN) (
func (s *State) SetSettings(ctx context.Context, vpn settings.VPN) (
outcome string) {
s.settingsMu.Lock()
settingsUnchanged := reflect.DeepEqual(s.vpn, vpn)