Commit 18d305f4 authored by Ruslan Drozhdzh's avatar Ruslan Drozhdzh Committed by Miek Gieben

plugin/errors: remove cLogger and eLogger (#2657)

parent 89a4b9bd
...@@ -35,28 +35,19 @@ func (p *pattern) setTimer(t *time.Timer) { ...@@ -35,28 +35,19 @@ func (p *pattern) setTimer(t *time.Timer) {
// errorHandler handles DNS errors (and errors from other plugin). // errorHandler handles DNS errors (and errors from other plugin).
type errorHandler struct { type errorHandler struct {
patterns []*pattern patterns []*pattern
eLogger func(int, string, string, string)
cLogger func(uint32, string, time.Duration)
stopFlag uint32 stopFlag uint32
Next plugin.Handler Next plugin.Handler
} }
func newErrorHandler() *errorHandler { func newErrorHandler() *errorHandler {
return &errorHandler{eLogger: errorLogger, cLogger: consLogger} return &errorHandler{}
}
func errorLogger(code int, qName, qType, err string) {
log.Errorf("%d %s %s: %s", code, qName, qType, err)
}
func consLogger(cnt uint32, pattern string, p time.Duration) {
log.Errorf("%d errors like '%s' occurred in last %s", cnt, pattern, p)
} }
func (h *errorHandler) logPattern(i int) { func (h *errorHandler) logPattern(i int) {
cnt := atomic.SwapUint32(&h.patterns[i].count, 0) cnt := atomic.SwapUint32(&h.patterns[i].count, 0)
if cnt > 0 { if cnt > 0 {
h.cLogger(cnt, h.patterns[i].pattern.String(), h.patterns[i].period) log.Errorf("%d errors like '%s' occurred in last %s",
cnt, h.patterns[i].pattern.String(), h.patterns[i].period)
} }
} }
...@@ -102,7 +93,7 @@ func (h *errorHandler) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dn ...@@ -102,7 +93,7 @@ func (h *errorHandler) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dn
} }
} }
state := request.Request{W: w, Req: r} state := request.Request{W: w, Req: r}
h.eLogger(rcode, state.Name(), state.Type(), strErr) log.Errorf("%d %s %s: %s", rcode, state.Name(), state.Type(), strErr)
} }
return rcode, err return rcode, err
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment