Skip to content

Commit

Permalink
dnsforward: fix upstream mode set
Browse files Browse the repository at this point in the history
  • Loading branch information
EugeneOne1 committed Mar 25, 2024
1 parent 2611534 commit cdc2193
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Expand Up @@ -33,9 +33,14 @@ NOTE: Add new changes BELOW THIS COMMENT.
- Currently, AdGuard Home uses a best-effort algorithm to fix invalid IDs of
filtering-rule lists on startup. This feature is deprecated, and invalid IDs
will cause errors on startup in a future version.
- Node.JS 16. Future versions will require at least Node.JS 18 to build.
- Node.JS 16. Future versions will require at least Node.JS 18 to build.\

### Fixed

- Resetting DNS upstream mode when applying unrelated settings ([#6851]).

[#5829]: https://github.com/AdguardTeam/AdGuardHome/issues/5829
[#6851]: https://github.com/AdguardTeam/AdGuardHome/issues/6851

<!--
NOTE: Add new changes ABOVE THIS COMMENT.
Expand Down
2 changes: 0 additions & 2 deletions internal/dnsforward/http.go
Expand Up @@ -474,8 +474,6 @@ func (s *Server) setConfig(dc *jsonDNSConfig) (shouldRestart bool) {

if dc.UpstreamMode != nil {
s.conf.UpstreamMode = mustParseUpstreamMode(*dc.UpstreamMode)
} else {
s.conf.UpstreamMode = UpstreamModeLoadBalance
}

if dc.EDNSCSUseCustom != nil && *dc.EDNSCSUseCustom {
Expand Down
4 changes: 4 additions & 0 deletions internal/dnsforward/http_test.go
Expand Up @@ -29,6 +29,10 @@ import (
"github.com/stretchr/testify/require"
)

// TODO(e.burkov): Use the better approach to testdata with a separate
// directory for each test, and a separate file for each subtest. See the
// [configmigrate] package.

// emptySysResolvers is an empty [SystemResolvers] implementation that always
// returns nil.
type emptySysResolvers struct{}
Expand Down

0 comments on commit cdc2193

Please sign in to comment.