mirror of
https://github.com/qdm12/gluetun.git
synced 2026-06-19 01:43:56 +02:00
chore(dns): refactor loop code Run to have less indentation
This commit is contained in:
+11
-9
@@ -4,6 +4,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/qdm12/dns/v2/pkg/nameserver"
|
"github.com/qdm12/dns/v2/pkg/nameserver"
|
||||||
|
"github.com/qdm12/gluetun/internal/configuration/settings"
|
||||||
"github.com/qdm12/gluetun/internal/constants"
|
"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
|
// Their values are to be used if DOT=off
|
||||||
var runError <-chan error
|
var runError <-chan error
|
||||||
|
|
||||||
|
var settings settings.DNS
|
||||||
for {
|
for {
|
||||||
settings := l.GetSettings()
|
settings = l.GetSettings()
|
||||||
var err error
|
var err error
|
||||||
runError, err = l.setupServer(ctx, settings)
|
runError, err = l.setupServer(ctx, settings)
|
||||||
if err == nil {
|
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
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
l.signalOrSetStatus(constants.Crashed)
|
l.signalOrSetStatus(constants.Crashed)
|
||||||
|
|
||||||
if ctx.Err() != nil {
|
if ctx.Err() != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
l.logAndWait(ctx, err)
|
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.signalOrSetStatus(constants.Running)
|
||||||
|
|
||||||
l.userTrigger = false
|
l.userTrigger = false
|
||||||
|
|||||||
Reference in New Issue
Block a user