a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge: - filters: windows: fix update procedure 

Close #878

* commit '2c91de73af78a032c076dbad6dcdb85e22e82536':
  * minor
  - filters: start DNS server after filter has been removed
  - filters: windows: fix update procedure
This commit is contained in:
Simon Zolin 2019-07-16 13:58:54 +03:00
parent 4326a2c945 2c91de73af
commit 87ccd192c3
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
home/dns.go
View File

@ -256,10 +256,6 @@ func startDNSServer() error {
} }
func reconfigureDNSServer() error { func reconfigureDNSServer() error {
if !isRunning() {
return nil
}
config, err := generateServerConfig() config, err := generateServerConfig()
if err != nil { if err != nil {
return errorx.Decorate(err, "Couldn't start forwarding DNS server") return errorx.Decorate(err, "Couldn't start forwarding DNS server")

31
home/filter.go
View File

@ -170,12 +170,15 @@ func periodicallyRefreshFilters() {
// Algorithm: // Algorithm:
// . Get the list of filters to be updated // . Get the list of filters to be updated
// . For each filter run the download and checksum check operation // . For each filter run the download and checksum check operation
// . If filter data hasn't changed, set new update time // . Stop server
// . If filter data has changed, parse it, save it on disk, set new update time // . For each filter:
// . If filter data hasn't changed, just set new update time on file
// . If filter data has changed, save it on disk
// . Apply changes to the current configuration // . Apply changes to the current configuration
// . Restart server // . Start server
func refreshFiltersIfNecessary(force bool) int { func refreshFiltersIfNecessary(force bool) int {
var updateFilters []filter var updateFilters []filter
var updateFlags []bool // 'true' if filter data has changed
if config.firstRun { if config.firstRun {
return 0 return 0
@ -210,21 +213,28 @@ func refreshFiltersIfNecessary(force bool) int {
log.Printf("Failed to update filter %s: %s\n", uf.URL, err) log.Printf("Failed to update filter %s: %s\n", uf.URL, err)
continue continue
} }
uf.LastUpdated = time.Now()
updateFlags = append(updateFlags, updated)
}
isRunning := isRunning()
_ = dnsServer.Stop()
for i := range updateFilters {
uf := &updateFilters[i]
updated := updateFlags[i]
if updated { if updated {
// Saving it to the filters dir now // Saving it to the filters dir now
err = uf.save() err := uf.save()
if err != nil { if err != nil {
log.Printf("Failed to save the updated filter %d: %s", uf.ID, err) log.Printf("Failed to save the updated filter %d: %s", uf.ID, err)
continue continue
} }
} else { } else {
mtime := time.Now() e := os.Chtimes(uf.Path(), uf.LastUpdated, uf.LastUpdated)
e := os.Chtimes(uf.Path(), mtime, mtime)
if e != nil { if e != nil {
log.Error("os.Chtimes(): %v", e) log.Error("os.Chtimes(): %v", e)
} }
uf.LastUpdated = mtime
} }
config.Lock() config.Lock()
@ -249,11 +259,10 @@ func refreshFiltersIfNecessary(force bool) int {
config.Unlock() config.Unlock()
} }
if updateCount > 0 && isRunning() { if updateCount > 0 && isRunning {
err := reconfigureDNSServer() err := reconfigureDNSServer()
if err != nil { if err != nil {
msg := fmt.Sprintf("SHOULD NOT HAPPEN: cannot reconfigure DNS server with the new filters: %s", err) log.Error("cannot reconfigure DNS server with the new filters: %s", err)
panic(msg)
} }
} }
return updateCount return updateCount