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

@@ -20,7 +20,7 @@ func (s *Server) runHealthcheckLoop(ctx context.Context, done chan<- struct{}) {
if previousErr != nil && err == nil {
s.logger.Info("healthy!")
s.vpn.healthyTimer.Stop()
s.vpn.healthyWait = s.config.VPN.Initial
s.vpn.healthyWait = *s.config.VPN.Initial
} else if previousErr == nil && err != nil {
s.logger.Info("unhealthy: " + err.Error())
s.vpn.healthyTimer.Stop()

View File

@@ -19,6 +19,6 @@ func (s *Server) onUnhealthyVPN(ctx context.Context) {
s.vpn.healthyWait.String() + ": restarting VPN")
_, _ = s.vpn.looper.ApplyStatus(ctx, constants.Stopped)
_, _ = s.vpn.looper.ApplyStatus(ctx, constants.Running)
s.vpn.healthyWait += s.config.VPN.Addition
s.vpn.healthyWait += *s.config.VPN.Addition
s.vpn.healthyTimer = time.NewTimer(s.vpn.healthyWait)
}

View File

@@ -3,7 +3,7 @@ package healthcheck
import (
"context"
"github.com/qdm12/gluetun/internal/configuration"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/vpn"
)
@@ -17,11 +17,11 @@ type Server struct {
logger Logger
handler *handler
pinger Pinger
config configuration.Health
config settings.Health
vpn vpnHealth
}
func NewServer(config configuration.Health,
func NewServer(config settings.Health,
logger Logger, vpnLooper vpn.Looper) *Server {
return &Server{
logger: logger,
@@ -30,7 +30,7 @@ func NewServer(config configuration.Health,
config: config,
vpn: vpnHealth{
looper: vpnLooper,
healthyWait: config.VPN.Initial,
healthyWait: *config.VPN.Initial,
},
}
}