mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-03-04 10:24:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Have fetchFromCache support a TTL parameter

Browse source 
Partially
fixes #854
This commit is contained in:
Frank Denis 2019-06-13 11:24:15 +02:00
parent df24db9b9d
commit d27171f62b
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
dnscrypt-proxy/sources.go
View file

@ -27,7 +27,7 @@ const (
) )
const ( const (
SourcesUpdateDelay = time.Duration(24) * time.Hour MinSourcesUpdateDelay = time.Duration(24) * time.Hour
) )
type Source struct { type Source struct {
@ -36,8 +36,11 @@ type Source struct {
in string in string
} }
func fetchFromCache(cacheFile string) (in string, expired bool, delayTillNextUpdate time.Duration, err error) { func fetchFromCache(cacheFile string, refreshDelay time.Duration) (in string, expired bool, delayTillNextUpdate time.Duration, err error) {
expired = false expired = false
if refreshDelay < MinSourcesUpdateDelay {
refreshDelay = MinSourcesUpdateDelay
}
fi, err := os.Stat(cacheFile) fi, err := os.Stat(cacheFile)
if err != nil { if err != nil {
dlog.Debugf("Cache file [%s] not present", cacheFile) dlog.Debugf("Cache file [%s] not present", cacheFile)
@ -45,9 +48,9 @@ func fetchFromCache(cacheFile string) (in string, expired bool, delayTillNextUpd
return return
} }
elapsed := time.Since(fi.ModTime()) elapsed := time.Since(fi.ModTime())
if elapsed < SourcesUpdateDelay { if elapsed < refreshDelay {
dlog.Debugf("Cache file [%s] is still fresh", cacheFile) dlog.Debugf("Cache file [%s] is still fresh", cacheFile)
delayTillNextUpdate = SourcesUpdateDelay - elapsed delayTillNextUpdate = refreshDelay - elapsed
} else { } else {
dlog.Debugf("Cache file [%s] needs to be refreshed", cacheFile) dlog.Debugf("Cache file [%s] needs to be refreshed", cacheFile)
delayTillNextUpdate = time.Duration(0) delayTillNextUpdate = time.Duration(0)
@ -65,10 +68,10 @@ func fetchFromCache(cacheFile string) (in string, expired bool, delayTillNextUpd
return return
} }
func fetchWithCache(xTransport *XTransport, urlStr string, cacheFile string) (in string, cached bool, delayTillNextUpdate time.Duration, err error) { func fetchWithCache(xTransport *XTransport, urlStr string, cacheFile string, refreshDelay time.Duration) (in string, cached bool, delayTillNextUpdate time.Duration, err error) {
cached = false cached = false
expired := false expired := false
in, expired, delayTillNextUpdate, err = fetchFromCache(cacheFile) in, expired, delayTillNextUpdate, err = fetchFromCache(cacheFile, refreshDelay)
if err == nil && !expired { if err == nil && !expired {
dlog.Debugf("Delay till next update: %v", delayTillNextUpdate) dlog.Debugf("Delay till next update: %v", delayTillNextUpdate)
cached = true cached = true
@ -110,7 +113,7 @@ func fetchWithCache(xTransport *XTransport, urlStr string, cacheFile string) (in
err = nil err = nil
cached = false cached = false
in = string(bin) in = string(bin)
delayTillNextUpdate = SourcesUpdateDelay delayTillNextUpdate = refreshDelay
return return
} }
@ -125,7 +128,6 @@ type URLToPrefetch struct {
} }
func NewSource(xTransport *XTransport, urls []string, minisignKeyStr string, cacheFile string, formatStr string, refreshDelay time.Duration) (Source, []URLToPrefetch, error) { func NewSource(xTransport *XTransport, urls []string, minisignKeyStr string, cacheFile string, formatStr string, refreshDelay time.Duration) (Source, []URLToPrefetch, error) {
_ = refreshDelay
source := Source{urls: urls} source := Source{urls: urls}
if formatStr == "v2" { if formatStr == "v2" {
source.format = SourceFormatV2 source.format = SourceFormatV2
@ -146,14 +148,14 @@ func NewSource(xTransport *XTransport, urls []string, minisignKeyStr string, cac
var sigErr error var sigErr error
var preloadURL string var preloadURL string
if len(urls) <= 0 { if len(urls) <= 0 {
in, cached, delayTillNextUpdate, err = fetchWithCache(xTransport, "", cacheFile) in, cached, delayTillNextUpdate, err = fetchWithCache(xTransport, "", cacheFile, refreshDelay)
sigStr, sigCached, sigDelayTillNextUpdate, sigErr = fetchWithCache(xTransport, "", sigCacheFile) sigStr, sigCached, sigDelayTillNextUpdate, sigErr = fetchWithCache(xTransport, "", sigCacheFile, refreshDelay)
} else { } else {
preloadURL = urls[0] preloadURL = urls[0]
for _, url := range urls { for _, url := range urls {
sigURL := url + ".minisig" sigURL := url + ".minisig"
in, cached, delayTillNextUpdate, err = fetchWithCache(xTransport, url, cacheFile) in, cached, delayTillNextUpdate, err = fetchWithCache(xTransport, url, cacheFile, refreshDelay)
sigStr, sigCached, sigDelayTillNextUpdate, sigErr = fetchWithCache(xTransport, sigURL, sigCacheFile) sigStr, sigCached, sigDelayTillNextUpdate, sigErr = fetchWithCache(xTransport, sigURL, sigCacheFile, refreshDelay)
if err == nil && sigErr == nil { if err == nil && sigErr == nil {
preloadURL = url preloadURL = url
break break
@ -268,7 +270,7 @@ func (source *Source) parseV2(prefix string) ([]RegisteredServer, error) {
} }
func PrefetchSourceURL(xTransport *XTransport, urlToPrefetch *URLToPrefetch) error { func PrefetchSourceURL(xTransport *XTransport, urlToPrefetch *URLToPrefetch) error {
in, cached, delayTillNextUpdate, err := fetchWithCache(xTransport, urlToPrefetch.url, urlToPrefetch.cacheFile) in, cached, delayTillNextUpdate, err := fetchWithCache(xTransport, urlToPrefetch.url, urlToPrefetch.cacheFile, MinSourcesUpdateDelay)
if err == nil && !cached { if err == nil && !cached {
AtomicFileWrite(urlToPrefetch.cacheFile, []byte(in)) AtomicFileWrite(urlToPrefetch.cacheFile, []byte(in))
} }