mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-08-16 22:20:30 +03:00
Pull request 2184: 6851 upstream mode reset
Updates #6851. Squashed commit of the following: commit ffc50daff8e9a2b0fd48f10c5e66cdc0ab350488 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Mar 25 17:55:39 2024 +0300 all: fix changelog commit cdc2193875e72f6504cf283c84e1e6c6768d4f6e Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Mar 25 17:28:06 2024 +0300 dnsforward: fix upstream mode set
This commit is contained in:
parent
2611534de0
commit
9305c45813
@ -35,7 +35,12 @@ NOTE: Add new changes BELOW THIS COMMENT.
|
||||
will cause errors on startup in a future version.
|
||||
- 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.
|
||||
|
@ -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 {
|
||||
|
@ -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{}
|
||||
|
Loading…
Reference in New Issue
Block a user