diff options
| author |  Yong Tang <yongtang@users.noreply.github.com>
| 2016-09-16 07:50:16 -0700 |
|---|---|---|
| committer |  Miek Gieben <miek@miek.nl>
| 2016-09-16 15:50:16 +0100 |
| commit | 953cfc1de49ffe9748a876c16b4b45c3f518f6d1 (patch) | |
| tree | dd8778c0147801019134bc4a4acb18c9caf323b5 /middleware/errors/setup.go | |
| parent | 1c6dd35b23ce47f027400ddde74eea8c3299dfad (diff) | |
| download | coredns-953cfc1de49ffe9748a876c16b4b45c3f518f6d1.tar.gz coredns-953cfc1de49ffe9748a876c16b4b45c3f518f6d1.tar.zst coredns-953cfc1de49ffe9748a876c16b4b45c3f518f6d1.zip | |
Remove lumberjack logger (#257)
* Removed lumberjack from coremain
As is mentioned in 251, this fix removed lumberjack from coremain.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
* Remove lumberjack from log middleware
As mentioned in 251, lumberjack is not suitable for applications like CoreDNS
so it is removed from the log middleware.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
* Update log/README.md as lumberjack has been removed
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
* Adjust default log output from `ioutil.Discard` to `os.Stdout`
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Diffstat (limited to 'middleware/errors/setup.go')
| -rw-r--r-- | middleware/errors/setup.go | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/middleware/errors/setup.go b/middleware/errors/setup.go index e732a1e34..a5fa86921 100644 --- a/middleware/errors/setup.go +++ b/middleware/errors/setup.go @@ -7,7 +7,6 @@ import ( "github.com/miekg/coredns/core/dnsserver" "github.com/miekg/coredns/middleware" - "github.com/miekg/coredns/middleware/pkg/roller" "github.com/hashicorp/go-syslog" "github.com/mholt/caddy" @@ -51,15 +50,7 @@ func setup(c *caddy.Controller) error { if err != nil { return middleware.Error("errors", err) } - if handler.LogRoller != nil { - file.Close() - - handler.LogRoller.Filename = handler.LogFile - - writer = handler.LogRoller.GetLogWriter() - } else { - writer = file - } + writer = file } handler.Log = log.New(writer, "", 0) @@ -91,16 +82,6 @@ func errorsParse(c *caddy.Controller) (ErrorHandler, error) { handler.Debug = true } else { handler.LogFile = where - if c.NextArg() { - if c.Val() == "{" { - c.IncrNest() - logRoller, err := roller.Parse(c) - if err != nil { - return hadBlock, err - } - handler.LogRoller = logRoller - } - } } } } @@ -108,10 +89,6 @@ func errorsParse(c *caddy.Controller) (ErrorHandler, error) { } for c.Next() { - // weird hack to avoid having the handler values overwritten. - if c.Val() == "}" { - continue - } // Configuration may be in a block hadBlock, err := optionalBlock() if err != nil { |