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

dnsforward -- fix panic on ANY request

This commit is contained in:
Eugene Bujak 2018-12-06 16:55:05 +03:00
parent c82a5ac0cb
commit 15f3c82238
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dnsforward/querylog_top.go
View File

@ -168,7 +168,7 @@ func (r *dayTop) addEntry(entry *logEntry, q *dns.Msg, now time.Time) error {
return err return err
} }
if entry.Result.IsFiltered { if entry.Result != nil && entry.Result.IsFiltered {
err := runningTop.hours[hour].incrementBlocked(hostname) err := runningTop.hours[hour].incrementBlocked(hostname)
if err != nil { if err != nil {
log.Printf("Failed to increment value: %s", err) log.Printf("Failed to increment value: %s", err)

3
dnsforward/stats.go
View File

@ -193,9 +193,11 @@ func (h *histogram) Observe(value float64) {
// ----- // -----
func incrementCounters(entry *logEntry) { func incrementCounters(entry *logEntry) {
requests.IncWithTime(entry.Time) requests.IncWithTime(entry.Time)
if entry.Result != nil {
if entry.Result.IsFiltered { if entry.Result.IsFiltered {
filtered.IncWithTime(entry.Time) filtered.IncWithTime(entry.Time)
} }
switch entry.Result.Reason { switch entry.Result.Reason {
case dnsfilter.NotFilteredWhiteList: case dnsfilter.NotFilteredWhiteList:
whitelisted.IncWithTime(entry.Time) whitelisted.IncWithTime(entry.Time)
@ -212,6 +214,7 @@ func incrementCounters(entry *logEntry) {
case dnsfilter.FilteredSafeSearch: case dnsfilter.FilteredSafeSearch:
safesearch.IncWithTime(entry.Time) safesearch.IncWithTime(entry.Time)
} }
}
elapsedTime.ObserveWithTime(entry.Elapsed.Seconds(), entry.Time) elapsedTime.ObserveWithTime(entry.Elapsed.Seconds(), entry.Time)
} }