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

Schedule a prefetch if we got a set or its signature from a backup cache 

This is not pretty, and has to be rewritten for the next beta
This commit is contained in:
Frank Denis 2018-01-18 23:54:53 +01:00
parent 008d2d9093
commit 43e5689387
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dnscrypt-proxy/main.go
View File

@ -99,6 +99,7 @@ func main() {
}
func (app *App) Start(service service.Service) error {
dlog.Noticef("Starting dnscrypt-proxy %s", AppVersion)
proxy := app.proxy
if err := InitPluginsGlobals(&proxy.pluginsGlobals, &proxy); err != nil {
dlog.Fatal(err)
@ -157,7 +158,7 @@ func (proxy *Proxy) StartProxy() {
}
liveServers, err := proxy.serversInfo.refresh(proxy)
if liveServers > 0 {
dlog.Noticef("dnscrypt-proxy %s is ready - live servers: %d", AppVersion, liveServers)
dlog.Noticef("dnscrypt-proxy is ready - live servers: %d", liveServers)
daemon.SdNotify(false, "READY=1")
PrefetchSourceURLs(proxy.urlsToPrefetch)
} else if err != nil {

18
dnscrypt-proxy/sources.go
View File

@ -36,9 +36,9 @@ func fetchFromCache(cacheFile string) ([]byte, error) {
return ioutil.ReadFile(cacheFile)
}
func fetchWithCache(url string, cacheFile string, refreshDelay time.Duration) (in string, cached bool, delayTillNextUpdate time.Duration, err error) {
func fetchWithCache(url string, cacheFile string, refreshDelay time.Duration) (in string, cached bool, fromBackup bool, delayTillNextUpdate time.Duration, err error) {
var bin []byte
cached, usableCache, hotCache := false, false, false
cached, fromBackup, usableCache, hotCache := false, false, false, false
delayTillNextUpdate = refreshDelay
fi, err := os.Stat(cacheFile)
var elapsed time.Duration
@ -62,7 +62,7 @@ func fetchWithCache(url string, cacheFile string, refreshDelay time.Duration) (i
var resp *http.Response
dlog.Infof("Loading source information from URL [%s]", url)
resp, err = http.Get(url)
if resp.StatusCode < 200 || resp.StatusCode > 299 {
if err == nil && resp != nil && (resp.StatusCode < 200 || resp.StatusCode > 299) {
err = fmt.Errorf("Webserver returned code %d", resp.StatusCode)
}
if err != nil {
@ -74,6 +74,7 @@ func fetchWithCache(url string, cacheFile string, refreshDelay time.Duration) (i
if err != nil {
return
}
fromBackup = true
} else {
bin, err = ioutil.ReadAll(resp.Body)
resp.Body.Close()
@ -85,6 +86,7 @@ func fetchWithCache(url string, cacheFile string, refreshDelay time.Duration) (i
if err != nil {
return
}
fromBackup = true
}
}
}
@ -119,12 +121,12 @@ func NewSource(url string, minisignKeyStr string, cacheFile string, formatStr st
URLToPrefetch{url: url, cacheFile: cacheFile, when: when},
URLToPrefetch{url: sigURL, cacheFile: cacheFile, when: when},
}
in, cached, delayTillNextUpdate, err := fetchWithCache(url, cacheFile, refreshDelay)
in, cached, fromBackup, delayTillNextUpdate, err := fetchWithCache(url, cacheFile, refreshDelay)
if err != nil {
return source, urlsToPrefetch, err
}
sigCacheFile := cacheFile + ".minisig"
sigStr, sigCached, sigDelayTillNextUpdate, err := fetchWithCache(sigURL, sigCacheFile, refreshDelay)
sigStr, sigCached, sigFromBackup, sigDelayTillNextUpdate, err := fetchWithCache(sigURL, sigCacheFile, refreshDelay)
if err != nil {
return source, urlsToPrefetch, err
}
@ -159,7 +161,9 @@ func NewSource(url string, minisignKeyStr string, cacheFile string, formatStr st
delayTillNextUpdate = SourcesUpdateDelayAfterFailure
}
when = time.Now().Add(delayTillNextUpdate)
urlsToPrefetch = []URLToPrefetch{}
if !fromBackup && !sigFromBackup {
urlsToPrefetch = []URLToPrefetch{}
}
return source, urlsToPrefetch, nil
}
@ -210,7 +214,7 @@ func PrefetchSourceURLs(urlsToPrefetch []URLToPrefetch) {
}
dlog.Infof("Prefetching %d source URLs", len(urlsToPrefetch))
for _, urlToPrefetch := range urlsToPrefetch {
if _, _, _, err := fetchWithCache(urlToPrefetch.url, urlToPrefetch.cacheFile, time.Duration(0)); err != nil {
if _, _, _, _, err := fetchWithCache(urlToPrefetch.url, urlToPrefetch.cacheFile, time.Duration(0)); err != nil {
dlog.Debugf("[%s]: %s", urlToPrefetch.url, err)
}
}