From f7995aa022a1d15ee558ecae6ce47060310a87c9 Mon Sep 17 00:00:00 2001 From: Ildar Kamalov Date: Tue, 16 Jan 2024 12:42:11 +0300 Subject: [PATCH] Pull request: replace empty string with load_balance for upstream_mode Squashed commit of the following: commit 69d23105ce68e61132f2eb6571deb41fad25efbf Merge: 76df04027 58b47adaf Author: Ildar Kamalov Date: Tue Jan 16 12:22:52 2024 +0300 Merge branch 'master' into ADG-7965 commit 76df04027f52157b7ac820888bf8b91ecb93c48c Author: Ildar Kamalov Date: Fri Jan 12 13:18:21 2024 +0300 remove changelog commit e79b7bffdd8e9dc6d530049489e9fe8365827ae6 Merge: df0f18929 1e0ff4d43 Author: Ildar Kamalov Date: Fri Jan 12 13:17:50 2024 +0300 Merge branch 'master' into ADG-7965 commit df0f18929f4d4b7f9d20347fa5f8481b667a1bd8 Author: Ildar Kamalov Date: Wed Jan 10 19:21:34 2024 +0300 fix changelog commit 814308708d13e2f8a0077941e9547f379ee8f375 Author: Ildar Kamalov Date: Wed Jan 10 18:04:24 2024 +0300 handle empty string commit e9e672cd99c6dddad567dbf384c7ea30ff2262cc Author: Ildar Kamalov Date: Tue Jan 9 16:15:02 2024 +0300 changelog commit 34fb9b71e882ed5230df8d4caca88a930996f86b Author: Ildar Kamalov Date: Tue Jan 9 13:23:09 2024 +0300 ADG-7965 replace empty string with load_balance for upstream_mode --- client/src/helpers/constants.js | 2 +- client/src/reducers/dnsConfig.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/src/helpers/constants.js b/client/src/helpers/constants.js index 89f53cae..66454939 100644 --- a/client/src/helpers/constants.js +++ b/client/src/helpers/constants.js @@ -436,7 +436,7 @@ export const SCHEME_TO_PROTOCOL_MAP = { export const DNS_REQUEST_OPTIONS = { PARALLEL: 'parallel', FASTEST_ADDR: 'fastest_addr', - LOAD_BALANCING: '', + LOAD_BALANCING: 'load_balance', }; export const DHCP_FORM_NAMES = { diff --git a/client/src/reducers/dnsConfig.js b/client/src/reducers/dnsConfig.js index d877b6c4..93f64bd7 100644 --- a/client/src/reducers/dnsConfig.js +++ b/client/src/reducers/dnsConfig.js @@ -1,7 +1,7 @@ import { handleActions } from 'redux-actions'; import * as actions from '../actions/dnsConfig'; -import { ALL_INTERFACES_IP, BLOCKING_MODES } from '../helpers/constants'; +import { ALL_INTERFACES_IP, BLOCKING_MODES, DNS_REQUEST_OPTIONS } from '../helpers/constants'; const DEFAULT_BLOCKING_IPV4 = ALL_INTERFACES_IP; const DEFAULT_BLOCKING_IPV6 = '::'; @@ -15,6 +15,7 @@ const dnsConfig = handleActions( blocking_ipv4, blocking_ipv6, upstream_dns, + upstream_mode, fallback_dns, bootstrap_dns, local_ptr_upstreams, @@ -33,6 +34,7 @@ const dnsConfig = handleActions( local_ptr_upstreams: (local_ptr_upstreams && local_ptr_upstreams.join('\n')) || '', ratelimit_whitelist: (ratelimit_whitelist && ratelimit_whitelist.join('\n')) || '', processingGetConfig: false, + upstream_mode: upstream_mode === '' ? DNS_REQUEST_OPTIONS.LOAD_BALANCING : upstream_mode, }; },