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

14
internal/httpproxy/state/settings.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"reflect"
"github.com/qdm12/gluetun/internal/configuration"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/constants"
)
@@ -14,10 +14,10 @@ type SettingsGetSetter interface {
}
type SettingsGetter interface {
GetSettings() (settings configuration.HTTPProxy)
GetSettings() (settings settings.HTTPProxy)
}
func (s *State) GetSettings() (settings configuration.HTTPProxy) {
func (s *State) GetSettings() (settings settings.HTTPProxy) {
s.settingsMu.RLock()
defer s.settingsMu.RUnlock()
return s.settings
@@ -25,19 +25,19 @@ func (s *State) GetSettings() (settings configuration.HTTPProxy) {
type SettingsSetter interface {
SetSettings(ctx context.Context,
settings configuration.HTTPProxy) (outcome string)
settings settings.HTTPProxy) (outcome string)
}
func (s *State) SetSettings(ctx context.Context,
settings configuration.HTTPProxy) (outcome string) {
settings settings.HTTPProxy) (outcome string) {
s.settingsMu.Lock()
settingsUnchanged := reflect.DeepEqual(settings, s.settings)
if settingsUnchanged {
s.settingsMu.Unlock()
return "settings left unchanged"
}
newEnabled := settings.Enabled
previousEnabled := s.settings.Enabled
newEnabled := *settings.Enabled
previousEnabled := *s.settings.Enabled
s.settings = settings
s.settingsMu.Unlock()
// Either restart or set changed status

6
internal/httpproxy/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"
)
@@ -14,7 +14,7 @@ type Manager interface {
}
func New(statusApplier loopstate.Applier,
settings configuration.HTTPProxy) *State {
settings settings.HTTPProxy) *State {
return &State{
statusApplier: statusApplier,
settings: settings,
@@ -23,6 +23,6 @@ func New(statusApplier loopstate.Applier,
type State struct {
statusApplier loopstate.Applier
settings configuration.HTTPProxy
settings settings.HTTPProxy
settingsMu sync.RWMutex
}