diff options
| -rw-r--r-- | core/directives.go | 5 | ||||
| -rw-r--r-- | core/setup/errors.go | 80 | ||||
| -rw-r--r-- | middleware/etcd/handler.go | 1 |
3 files changed, 39 insertions, 47 deletions
diff --git a/core/directives.go b/core/directives.go index 2529dacb1..c6cb81592 100644 --- a/core/directives.go +++ b/core/directives.go @@ -53,7 +53,9 @@ var directiveOrder = []directive{ // Directives that inject handlers (middleware) {"prometheus", setup.Prometheus}, + {"errors", setup.Errors}, {"log", setup.Log}, + {"chaos", setup.Chaos}, {"rewrite", setup.Rewrite}, {"loadbalance", setup.Loadbalance}, @@ -62,7 +64,6 @@ var directiveOrder = []directive{ {"secondary", setup.Secondary}, {"etcd", setup.Etcd}, {"proxy", setup.Proxy}, - {"errors", setup.Errors}, } // RegisterDirective adds the given directive to caddy's list of directives. @@ -90,5 +91,5 @@ type directive struct { // SetupFunc takes a controller and may optionally return a middleware. // If the resulting middleware is not nil, it will be chained into -// the HTTP handlers in the order specified in this package. +// the DNS handlers in the order specified in this package. type SetupFunc func(c *setup.Controller) (middleware.Middleware, error) diff --git a/core/setup/errors.go b/core/setup/errors.go index d99751bf4..bf6b56f87 100644 --- a/core/setup/errors.go +++ b/core/setup/errors.go @@ -5,9 +5,10 @@ import ( "log" "os" - "github.com/hashicorp/go-syslog" "github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware/errors" + + "github.com/hashicorp/go-syslog" ) // Errors configures a new errors middleware instance. @@ -17,48 +18,42 @@ func Errors(c *Controller) (middleware.Middleware, error) { return nil, err } - // Open the log file for writing when the server starts - c.Startup = append(c.Startup, func() error { - var err error - var writer io.Writer - - switch handler.LogFile { - case "visible": - handler.Debug = true - case "stdout": - writer = os.Stdout - case "stderr": - writer = os.Stderr - case "syslog": - writer, err = gsyslog.NewLogger(gsyslog.LOG_ERR, "LOCAL0", "coredns") - if err != nil { - return err - } - default: - if handler.LogFile == "" { - writer = os.Stderr // default - break - } + var writer io.Writer + + switch handler.LogFile { + case "visible": + handler.Debug = true + case "stdout": + writer = os.Stdout + case "stderr": + writer = os.Stderr + case "syslog": + writer, err = gsyslog.NewLogger(gsyslog.LOG_ERR, "LOCAL0", "coredns") + if err != nil { + return nil, err + } + default: + if handler.LogFile == "" { + writer = os.Stderr // default + break + } - var file *os.File - file, err = os.OpenFile(handler.LogFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644) - if err != nil { - return err - } - if handler.LogRoller != nil { - file.Close() + var file *os.File + file, err = os.OpenFile(handler.LogFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644) + if err != nil { + return nil, err + } + if handler.LogRoller != nil { + file.Close() - handler.LogRoller.Filename = handler.LogFile + handler.LogRoller.Filename = handler.LogFile - writer = handler.LogRoller.GetLogWriter() - } else { - writer = file - } + writer = handler.LogRoller.GetLogWriter() + } else { + writer = file } - - handler.Log = log.New(writer, "", 0) - return nil - }) + } + handler.Log = log.New(writer, "", 0) return func(next middleware.Handler) middleware.Handler { handler.Next = next @@ -66,11 +61,8 @@ func Errors(c *Controller) (middleware.Middleware, error) { }, nil } -func errorsParse(c *Controller) (*errors.ErrorHandler, error) { - // Very important that we make a pointer because the Startup - // function that opens the log file must have access to the - // same instance of the handler, not a copy. - handler := &errors.ErrorHandler{} +func errorsParse(c *Controller) (errors.ErrorHandler, error) { + handler := errors.ErrorHandler{} optionalBlock := func() (bool, error) { var hadBlock bool diff --git a/middleware/etcd/handler.go b/middleware/etcd/handler.go index 729b049cc..38e1b51cd 100644 --- a/middleware/etcd/handler.go +++ b/middleware/etcd/handler.go @@ -73,7 +73,6 @@ func (e Etcd) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (i return e.Err(zone, dns.RcodeNameError, state) } if err != nil { - println("returning error", err.Error()) return dns.RcodeServerFailure, err } |