malhuda/AdGuardDNS
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardDNS.git synced 2025-02-20 11:23:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix linter warnings.

Browse Source
This commit is contained in:
Eugene Bujak 2018-12-03 16:42:04 +03:00
parent 7734a89ab2
commit d54fd77204
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
coredns_plugin/coredns_plugin.go
View File

@ -120,12 +120,12 @@ func setupPlugin(c *caddy.Controller) (*plug, error) {
if !c.NextArg() { if !c.NextArg() {
return nil, c.ArgErr() return nil, c.ArgErr()
} }
blockedTtl, err := strconv.ParseUint(c.Val(), 10, 32) blockedTTL, err := strconv.ParseUint(c.Val(), 10, 32)
if err != nil { if err != nil {
return nil, c.ArgErr() return nil, c.ArgErr()
} }
log.Printf("Blocked request TTL is %d", blockedTtl) log.Printf("Blocked request TTL is %d", blockedTTL)
p.settings.BlockedTTL = uint32(blockedTtl) p.settings.BlockedTTL = uint32(blockedTTL)
case "querylog": case "querylog":
log.Println("Query log is enabled") log.Println("Query log is enabled")
p.settings.QueryLogEnabled = true p.settings.QueryLogEnabled = true
@ -134,7 +134,7 @@ func setupPlugin(c *caddy.Controller) (*plug, error) {
return nil, c.ArgErr() return nil, c.ArgErr()
} }
filterId, err := strconv.ParseInt(c.Val(), 10, 64) filterID, err := strconv.ParseInt(c.Val(), 10, 64)
if err != nil { if err != nil {
return nil, c.ArgErr() return nil, c.ArgErr()
} }
@ -145,7 +145,7 @@ func setupPlugin(c *caddy.Controller) (*plug, error) {
// Initialize filter and add it to the list // Initialize filter and add it to the list
p.settings.Filters = append(p.settings.Filters, plugFilter{ p.settings.Filters = append(p.settings.Filters, plugFilter{
ID: filterId, ID: filterID,
Path: filterPath, Path: filterPath,
}) })
} }
@ -288,7 +288,7 @@ func (p *plug) Collect(ch chan<- prometheus.Metric) {
// lookup host, but return answer as if it was a result of origname lookup // lookup host, but return answer as if it was a result of origname lookup
func lookupReplaced(host string, origname string) ([]dns.RR, error) { func lookupReplaced(host string, origname string) ([]dns.RR, error) {
var records []dns.RR var records []dns.RR
var res *net.Resolver = nil // nil resolver is default resolver var res *net.Resolver // nil resolver is default resolver
addrs, err := res.LookupIPAddr(context.TODO(), host) addrs, err := res.LookupIPAddr(context.TODO(), host)
if err != nil { if err != nil {
return nil, err return nil, err
@ -445,14 +445,14 @@ func (p *plug) serveDNSInternal(ctx context.Context, w dns.ResponseWriter, r *dn
return rcode, dnsfilter.Result{}, err return rcode, dnsfilter.Result{}, err
} }
return rcode, result, err return rcode, result, err
} else {
// This is a hosts-syntax rule
rcode, err := p.replaceHostWithValAndReply(ctx, w, r, host, result.Ip.String(), question)
if err != nil {
return rcode, dnsfilter.Result{}, err
}
return rcode, result, err
} }
// This is a hosts-syntax rule
rcode, err := p.replaceHostWithValAndReply(ctx, w, r, host, result.Ip.String(), question)
if err != nil {
return rcode, dnsfilter.Result{}, err
}
return rcode, result, err
case dnsfilter.FilteredInvalid: case dnsfilter.FilteredInvalid:
// return NXdomain // return NXdomain
rcode, err := p.writeNXdomain(ctx, w, r) rcode, err := p.writeNXdomain(ctx, w, r)

2
coredns_plugin/coredns_stats.go
View File

@ -90,7 +90,7 @@ func (p *periodicStats) Observe(name string, when time.Time, value float64) {
currentValues := p.Entries[countname] currentValues := p.Entries[countname]
value := currentValues[elapsed] value := currentValues[elapsed]
// trace("Will change p.Entries[%s][%d] from %v to %v", countname, elapsed, value, value+1) // trace("Will change p.Entries[%s][%d] from %v to %v", countname, elapsed, value, value+1)
value += 1 value++
currentValues[elapsed] = value currentValues[elapsed] = value
p.Entries[countname] = currentValues p.Entries[countname] = currentValues
} }