7d824a5179
- 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)
48 lines
986 B
Go
48 lines
986 B
Go
package state
|
|
|
|
import (
|
|
"sync"
|
|
|
|
"github.com/qdm12/gluetun/internal/configuration/settings"
|
|
"github.com/qdm12/gluetun/internal/loopstate"
|
|
"github.com/qdm12/gluetun/internal/models"
|
|
)
|
|
|
|
var _ Manager = (*State)(nil)
|
|
|
|
type Manager interface {
|
|
SettingsGetSetter
|
|
ServersGetterSetter
|
|
GetSettingsAndServers() (vpn settings.VPN, allServers models.AllServers)
|
|
}
|
|
|
|
func New(statusApplier loopstate.Applier,
|
|
vpn settings.VPN, allServers models.AllServers) *State {
|
|
return &State{
|
|
statusApplier: statusApplier,
|
|
vpn: vpn,
|
|
allServers: allServers,
|
|
}
|
|
}
|
|
|
|
type State struct {
|
|
statusApplier loopstate.Applier
|
|
|
|
vpn settings.VPN
|
|
settingsMu sync.RWMutex
|
|
|
|
allServers models.AllServers
|
|
allServersMu sync.RWMutex
|
|
}
|
|
|
|
func (s *State) GetSettingsAndServers() (vpn settings.VPN,
|
|
allServers models.AllServers) {
|
|
s.settingsMu.RLock()
|
|
s.allServersMu.RLock()
|
|
vpn = s.vpn
|
|
allServers = s.allServers
|
|
s.settingsMu.RUnlock()
|
|
s.allServersMu.RUnlock()
|
|
return vpn, allServers
|
|
}
|