diff --git a/example-encrypted-dns.toml b/example-encrypted-dns.toml index b2cc141..bd13903 100644 --- a/example-encrypted-dns.toml +++ b/example-encrypted-dns.toml @@ -78,12 +78,6 @@ cache_ttl_min = 3600 cache_ttl_max = 86400 -## Temporarily serve cached entries after their TTL expired -## when servers are not responsive. - -serve_stale = true - - ## DNS cache: error TTL cache_ttl_error = 600 diff --git a/src/config.rs b/src/config.rs index 7d334fb..49c36d3 100644 --- a/src/config.rs +++ b/src/config.rs @@ -64,7 +64,6 @@ pub struct Config { pub cache_ttl_min: u32, pub cache_ttl_max: u32, pub cache_ttl_error: u32, - pub serve_stale: Option, pub user: Option, pub group: Option, pub chroot: Option, diff --git a/src/globals.rs b/src/globals.rs index f729935..4d7eb36 100644 --- a/src/globals.rs +++ b/src/globals.rs @@ -41,7 +41,6 @@ pub struct Globals { pub cache: Cache, pub cert_cache: Cache, pub blacklist: Option, - pub serve_stale: bool, pub anonymized_dns_enabled: bool, pub anonymized_dns_allowed_ports: Vec, pub anonymized_dns_allow_non_reserved_ports: bool, diff --git a/src/main.rs b/src/main.rs index 23fb52a..007b0be 100644 --- a/src/main.rs +++ b/src/main.rs @@ -509,7 +509,6 @@ fn main() -> Result<(), Error> { let key_cache_capacity = config.dnscrypt.key_cache_capacity; let cache_capacity = config.cache_capacity; - let serve_stale = config.serve_stale.unwrap_or(true); let state_file = &config.state_file; if let Some(secret_key_path) = matches.value_of("import-from-dnscrypt-wrapper") { @@ -657,7 +656,6 @@ fn main() -> Result<(), Error> { hasher, cache, cert_cache, - serve_stale, blacklist, anonymized_dns_enabled, anonymized_dns_allowed_ports, diff --git a/src/resolver.rs b/src/resolver.rs index 005d858..35fa122 100644 --- a/src/resolver.rs +++ b/src/resolver.rs @@ -129,7 +129,7 @@ pub async fn resolve( globals.varz.upstream_received.inc(); if dns::rcode_servfail(&response) || dns::rcode_refused(&response) { trace!("SERVFAIL/REFUSED: {}", dns::rcode(&response)); - if let (true, Some(cached_response)) = (globals.serve_stale, cached_response) { + if let Some(cached_response) = cached_response { trace!("Serving stale"); #[cfg(feature = "metrics")] {