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

Merge pull request #45 in DNS/adguard-dns from less-chatty to master 

* commit '7b7f7138806b0b743d4fb1c4fef3c40f513be8b4':
  Be less noisy during long periods of time
This commit is contained in:
Eugene Bujak 2018-09-28 20:04:25 +03:00
parent d7039d9222 7b7f713880
commit 04e9f74435
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
control.go
View File

@ -1167,7 +1167,6 @@ func (filter *filter) update(now time.Time) (bool, error) {
// use same update period for failed filter downloads to avoid flooding with requests // use same update period for failed filter downloads to avoid flooding with requests
filter.LastUpdated = now filter.LastUpdated = now
log.Printf("Fetching URL %s...", filter.URL)
resp, err := client.Get(filter.URL) resp, err := client.Get(filter.URL)
if resp != nil && resp.Body != nil { if resp != nil && resp.Body != nil {
defer resp.Body.Close() defer resp.Body.Close()
@ -1188,8 +1187,6 @@ func (filter *filter) update(now time.Time) (bool, error) {
return false, err return false, err
} }
log.Printf("%s: got %v bytes", filter.URL, len(body))
// extract filter name and count number of rules // extract filter name and count number of rules
lines := strings.Split(string(body), "\n") lines := strings.Split(string(body), "\n")
rulesCount := 0 rulesCount := 0
@ -1199,7 +1196,6 @@ func (filter *filter) update(now time.Time) (bool, error) {
line = strings.TrimSpace(line) line = strings.TrimSpace(line)
if len(line) > 0 && line[0] == '!' { if len(line) > 0 && line[0] == '!' {
if m := filterTitle.FindAllStringSubmatch(line, -1); len(m) > 0 && len(m[0]) >= 2 && !seenTitle { if m := filterTitle.FindAllStringSubmatch(line, -1); len(m) > 0 && len(m[0]) >= 2 && !seenTitle {
log.Printf("Setting filter title to %s\n", m[0][1])
filter.Name = m[0][1] filter.Name = m[0][1]
seenTitle = true seenTitle = true
} }
@ -1216,9 +1212,9 @@ func (filter *filter) update(now time.Time) (bool, error) {
} }
} }
if bytes.Equal(filter.contents, body) { if bytes.Equal(filter.contents, body) {
log.Printf("Filter contents of URL %s are same, not considering it as an update", filter.URL)
return false, nil return false, nil
} }
log.Printf("Filter %s updated: %d bytes, %d rules", filter.URL, len(body), rulesCount)
filter.RulesCount = rulesCount filter.RulesCount = rulesCount
filter.contents = body filter.contents = body
return true, nil return true, nil