chore(settings): refactor settings processing (#756)
- 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:
@@ -4,22 +4,22 @@ import (
|
||||
"context"
|
||||
"reflect"
|
||||
|
||||
"github.com/qdm12/gluetun/internal/configuration"
|
||||
"github.com/qdm12/gluetun/internal/configuration/settings"
|
||||
)
|
||||
|
||||
type SettingsGetSetter interface {
|
||||
GetSettings() (settings configuration.PublicIP)
|
||||
GetSettings() (settings settings.PublicIP)
|
||||
SetSettings(ctx context.Context,
|
||||
settings configuration.PublicIP) (outcome string)
|
||||
settings settings.PublicIP) (outcome string)
|
||||
}
|
||||
|
||||
func (s *State) GetSettings() (settings configuration.PublicIP) {
|
||||
func (s *State) GetSettings() (settings settings.PublicIP) {
|
||||
s.settingsMu.RLock()
|
||||
defer s.settingsMu.RUnlock()
|
||||
return s.settings
|
||||
}
|
||||
|
||||
func (s *State) SetSettings(ctx context.Context, settings configuration.PublicIP) (
|
||||
func (s *State) SetSettings(ctx context.Context, settings settings.PublicIP) (
|
||||
outcome string) {
|
||||
s.settingsMu.Lock()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user