From d876c7b487ff984bc29e798618a05d0275fa4b97 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 20 Mar 2020 20:53:03 +0100 Subject: [PATCH] Keep the default LB strategy if an invalid p* one is used --- .ci/test2-dnscrypt-proxy.toml | 1 + dnscrypt-proxy/config.go | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.ci/test2-dnscrypt-proxy.toml b/.ci/test2-dnscrypt-proxy.toml index e9a04214..91a308ee 100644 --- a/.ci/test2-dnscrypt-proxy.toml +++ b/.ci/test2-dnscrypt-proxy.toml @@ -4,6 +4,7 @@ require_dnssec = true dnscrypt_ephemeral_keys = true tls_disable_session_tickets = false ignore_system_dns = false +lb_strategy = 'p12' block_ipv6 = true block_unqualified = true block_undelegated = true diff --git a/dnscrypt-proxy/config.go b/dnscrypt-proxy/config.go index bc959dd2..5179c2c3 100644 --- a/dnscrypt-proxy/config.go +++ b/dnscrypt-proxy/config.go @@ -375,9 +375,10 @@ func ConfigLoad(proxy *Proxy, flags *ConfigFlags) error { if strings.HasPrefix(lbStrategyStr, "p") { n, err := strconv.ParseInt(strings.TrimPrefix(lbStrategyStr, "p"), 10, 32) if err != nil || n <= 0 { - dlog.Fatalf("Invalid load balancing strategy: [%s]", config.LBStrategy) + dlog.Warnf("Invalid load balancing strategy: [%s]", config.LBStrategy) + } else { + lbStrategy = LBStrategyPN{n: int(n)} } - lbStrategy = LBStrategyPN{n: int(n)} } else { dlog.Warnf("Unknown load balancing strategy: [%s]", config.LBStrategy) }