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:
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

View File

@@ -2,7 +2,6 @@ package httpproxy
import (
"context"
"strconv"
"github.com/qdm12/gluetun/internal/constants"
)
@@ -14,7 +13,7 @@ type Runner interface {
func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
defer close(done)
if !l.state.GetSettings().Enabled {
if !*l.state.GetSettings().Enabled {
select {
case <-l.start:
case <-ctx.Done():
@@ -26,8 +25,9 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
runCtx, runCancel := context.WithCancel(ctx)
settings := l.state.GetSettings()
address := ":" + strconv.Itoa(int(settings.Port))
server := New(runCtx, address, l.logger, settings.Stealth, settings.Log, settings.User, settings.Password)
server := New(runCtx, settings.ListeningAddress, l.logger,
*settings.Stealth, *settings.Log, *settings.User,
*settings.Password)
errorCh := make(chan error)
go server.Run(runCtx, errorCh)