Pull request #413: AGDNS-3379-add-defaults-to-lib

masterkusok · masterkusok · commit 98ec132f1b20 · 2025-11-24T17:21:56.000+03:00
Merge in GO/dnsproxy from AGDNS-3379-add-defaults-to-lib to master Squashed commit of the following: commit aef424b Author: f.setrakov <f.setrakov@adguard.com> Date: Mon Nov 24 16:24:44 2025 +0300 proxy: set default optimistic cache settings
diff --git a/proxy/proxy.go b/proxy/proxy.go
@@ -274,6 +274,9 @@ func New(c *Config) (p *Proxy, err error) {
 		p.bindRetryIvl = bindRetries.Interval
 	}
 
+	p.CacheOptimisticAnswerTTL = cmp.Or(p.CacheOptimisticAnswerTTL, DefaultOptimisticAnswerTTL)
+	p.CacheOptimisticMaxAge = cmp.Or(p.CacheOptimisticMaxAge, DefaultOptimisticMaxAge)
+
 	err = p.setupDNS64()
 	if err != nil {
 		return nil, fmt.Errorf("setting up DNS64: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -274,6 +274,9 @@ func New(c Config) (p Proxy, err error) {`
`274`	`274`	`p.bindRetryIvl = bindRetries.Interval`
`275`	`275`	`}`
`276`	`276`
	`277`	`+ p.CacheOptimisticAnswerTTL = cmp.Or(p.CacheOptimisticAnswerTTL, DefaultOptimisticAnswerTTL)`
	`278`	`+ p.CacheOptimisticMaxAge = cmp.Or(p.CacheOptimisticMaxAge, DefaultOptimisticMaxAge)`
	`279`	`+`
`277`	`280`	`err = p.setupDNS64()`
`278`	`281`	`if err != nil {`
`279`	`282`	`return nil, fmt.Errorf("setting up DNS64: %w", err)`