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

Simplify updateCache()

This commit is contained in:
Frank Denis 2023-04-07 16:18:50 +02:00
parent ea3625bcfd
commit 9c73ab3070
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dnscrypt-proxy/sources.go
View File

@ -98,17 +98,24 @@ func writeSource(f string, bin, sig []byte) (err error) {
return fSig.Commit() return fSig.Commit()
} }
func (source *Source) updateCache(bin, sig []byte, now time.Time) { func (source *Source) updateCache(bin, sig []byte, now time.Time) error {
f := source.cacheFile f := source.cacheFile
var writeErr error // an error writing cache isn't fatal // If the data and signature are unchanged, update the files timestamps only
if !bytes.Equal(source.bin, bin) { if bytes.Equal(source.bin, bin) {
if writeErr = writeSource(f, bin, sig); writeErr != nil { _ = os.Chtimes(f, now, now)
source.bin = bin _ = os.Chtimes(f+".minisig", now, now)
return return nil
}
} }
os.Chtimes(f, now, now) // Otherwise, write the new data and signature
source.bin = bin if err := writeSource(f, bin, sig); err != nil {
dlog.Warnf("Source [%s] failed to update cache file [%s]: %v", source.name, f, err)
return err
}
source.bin = bin // In-memory copy of the cache file content
// The tests require the timestamps to be updated, no idea why
_ = os.Chtimes(f, now, now)
_ = os.Chtimes(f+".minisig", now, now)
return nil
} }
func (source *Source) parseURLs(urls []string) { func (source *Source) parseURLs(urls []string) {