miracle091/dnscrypt-proxy
miracle091
/
dnscrypt-proxy
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move `when` from URLToPrefetch struct to `refresh` on Source struct

This commit is contained in:
William Elwood 2019-10-31 09:15:21 +00:00 committed by Frank Denis
parent b29c70551e
commit a83ecf626b
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dnscrypt-proxy/sources.go
View File

@ -38,6 +38,7 @@ type Source struct {
minisignKey *minisign.PublicKey
cacheFile string
cacheTTL, prefetchDelay time.Duration
refresh time.Time
}
func (source *Source) checkSignature(bin, sig []byte) (err error) {
@ -134,8 +135,7 @@ func (source *Source) fetchWithCache(xTransport *XTransport, urlStr string) (bin
}
type URLToPrefetch struct {
url string
when time.Time
url string
}
func NewSource(xTransport *XTransport, urls []string, minisignKeyStr string, cacheFile string, formatStr string, refreshDelay time.Duration) (source *Source, err error) {
@ -171,10 +171,11 @@ func NewSource(xTransport *XTransport, urls []string, minisignKeyStr string, cac
}
dlog.Infof("Loading from [%s] failed", url)
}
source.refresh = now.Add(delayTillNextUpdate)
}
if len(preloadURL) > 0 {
url := preloadURL
source.prefetch = append(source.prefetch, &URLToPrefetch{url: url, when: now.Add(delayTillNextUpdate)})
source.prefetch = append(source.prefetch, &URLToPrefetch{url: url})
}
if err != nil {
return
@ -192,19 +193,23 @@ func PrefetchSources(xTransport *XTransport, sources []*Source) time.Duration {
now := timeNow()
interval := MinimumPrefetchInterval
for _, source := range sources {
if source.refresh.IsZero() {
continue
}
for _, urlToPrefetch := range source.prefetch {
if now.After(urlToPrefetch.when) {
dlog.Debugf("Prefetching [%s]", urlToPrefetch.url)
_, _, delay, err := source.fetchWithCache(xTransport, urlToPrefetch.url)
if err != nil {
dlog.Debugf("Prefetching [%s] failed: %v", urlToPrefetch.url, err)
continue
}
dlog.Debugf("Prefetching [%s] succeeded. Next refresh scheduled for %v", urlToPrefetch.url, urlToPrefetch.when)
urlToPrefetch.when = now.Add(delay)
if delay >= MinimumPrefetchInterval && (interval == MinimumPrefetchInterval || interval > delay) {
interval = delay
}
if source.refresh.After(now) {
continue
}
dlog.Debugf("Prefetching [%s]", urlToPrefetch.url)
_, _, delay, err := source.fetchWithCache(xTransport, urlToPrefetch.url)
if err != nil {
dlog.Debugf("Prefetching [%s] failed: %v", urlToPrefetch.url, err)
continue
}
dlog.Debugf("Prefetching [%s] succeeded. Next refresh scheduled for %v", urlToPrefetch.url, source.refresh)
source.refresh = now.Add(delay)
if delay >= MinimumPrefetchInterval && (interval == MinimumPrefetchInterval || interval > delay) {
interval = delay
}
}
}

9
dnscrypt-proxy/sources_test.go
View File

@ -292,12 +292,14 @@ func prepSourceTestDownload(t *testing.T, d *SourceTestData, e *SourceTestExpect
}
e.Source.urls = append(e.Source.urls, d.server.URL+path)
if state != TestStatePathErr {
e.Source.prefetch = append(e.Source.prefetch, &URLToPrefetch{d.server.URL + path, e.refresh})
e.Source.prefetch = append(e.Source.prefetch, &URLToPrefetch{d.server.URL + path})
}
}
if e.success {
e.err = ""
}
} else {
e.refresh = time.Time{}
}
}
@ -315,6 +317,7 @@ func setupSourceTestCase(t *testing.T, d *SourceTestData, i int,
i = (i + 1) % len(d.sources) // make the cached and downloaded fixtures different
}
prepSourceTestDownload(t, d, e, d.sources[i], downloadTest)
e.Source.refresh = e.refresh
return
}
@ -389,8 +392,8 @@ func TestPrefetchSources(t *testing.T) {
_, e := setupSourceTestCase(t, d, i, nil, downloadTest)
sources = append(sources, e.Source)
expects = append(expects, e)
for _, pf := range e.Source.prefetch {
pf.when = d.timeOld
if !e.Source.refresh.IsZero() {
e.Source.refresh = d.timeOld
}
if e.download {
e.refresh = d.timeUpd