From 85d2917e8ef6cfd0384848790f678ab541533f44 Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Mon, 16 Mar 2026 13:53:14 +0000 Subject: [PATCH] chore(dns): refactor loop code Run to have less indentation --- internal/dns/run.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/internal/dns/run.go b/internal/dns/run.go index f31a9dea..f3b56b23 100644 --- a/internal/dns/run.go +++ b/internal/dns/run.go @@ -4,6 +4,7 @@ import ( "context" "github.com/qdm12/dns/v2/pkg/nameserver" + "github.com/qdm12/gluetun/internal/configuration/settings" "github.com/qdm12/gluetun/internal/constants" ) @@ -31,28 +32,29 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) { // Their values are to be used if DOT=off var runError <-chan error + var settings settings.DNS for { - settings := l.GetSettings() + settings = l.GetSettings() var err error runError, err = l.setupServer(ctx, settings) if err == nil { - l.backoffTime = defaultBackoffTime - l.logger.Infof("ready and using DNS server with %s upstream resolvers", settings.UpstreamType) - - err = l.updateFiles(ctx, settings) - if err != nil { - l.logger.Warn("downloading block lists failed, skipping: " + err.Error()) - } break } l.signalOrSetStatus(constants.Crashed) - if ctx.Err() != nil { return } l.logAndWait(ctx, err) } + + l.backoffTime = defaultBackoffTime + l.logger.Infof("ready and using DNS server with %s upstream resolvers", settings.UpstreamType) + + err = l.updateFiles(ctx, settings) + if err != nil { + l.logger.Warn("downloading block lists failed, skipping: " + err.Error()) + } l.signalOrSetStatus(constants.Running) l.userTrigger = false