From e261ac1a6e64077e288ca95fbb805c9ce7aafba0 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Wed, 31 May 2017 20:28:53 +0100 Subject: middleware/{log,errors}: output everything to stdout (#684) Limit the options in both errors and log middleware, just output to stdout and let someone else (journald,docker) care about where to route the logs. This removes syslog and logging to a file. Fixes #573 #602 --- middleware/errors/errors.go | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'middleware/errors/errors.go') diff --git a/middleware/errors/errors.go b/middleware/errors/errors.go index d2b6f3a22..057e65089 100644 --- a/middleware/errors/errors.go +++ b/middleware/errors/errors.go @@ -20,7 +20,6 @@ type errorHandler struct { Next middleware.Handler LogFile string Log *log.Logger - Debug bool // if true, errors are written out to client rather than to a log } // ServeDNS implements the middleware.Handler interface. @@ -33,15 +32,6 @@ func (h errorHandler) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns state := request.Request{W: w, Req: r} errMsg := fmt.Sprintf("%s [ERROR %d %s %s] %v", time.Now().Format(timeFormat), rcode, state.Name(), state.Type(), err) - if h.Debug { - // Write error to response as a txt message instead of to log - answer := debugMsg(rcode, r) - txt, _ := dns.NewRR(". IN 0 TXT " + errMsg) - answer.Answer = append(answer.Answer, txt) - state.SizeAndDo(answer) - w.WriteMsg(answer) - return 0, err - } h.Log.Println(errMsg) } @@ -56,7 +46,6 @@ func (h errorHandler) recovery(ctx context.Context, w dns.ResponseWriter, r *dns return } - state := request.Request{W: w, Req: r} // Obtain source of panic // From: https://gist.github.com/swdunlop/9629168 var name, file string // function name, file name @@ -83,20 +72,8 @@ func (h errorHandler) recovery(ctx context.Context, w dns.ResponseWriter, r *dns } panicMsg := fmt.Sprintf("%s [PANIC %s %s] %s:%d - %v", time.Now().Format(timeFormat), r.Question[0].Name, dns.Type(r.Question[0].Qtype), file, line, rec) - if h.Debug { - // Write error and stack trace to the response rather than to a log - var stackBuf [4096]byte - stack := stackBuf[:runtime.Stack(stackBuf[:], false)] - answer := debugMsg(dns.RcodeServerFailure, r) - // add stack buf in TXT, limited to 255 chars for now. - txt, _ := dns.NewRR(". IN 0 TXT " + string(stack[:255])) - answer.Answer = append(answer.Answer, txt) - state.SizeAndDo(answer) - w.WriteMsg(answer) - } else { - // Currently we don't use the function name, since file:line is more conventional - h.Log.Printf(panicMsg) - } + // Currently we don't use the function name, since file:line is more conventional + h.Log.Printf(panicMsg) } // debugMsg creates a debug message that gets send back to the client. -- cgit v1.2.3