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>

3 files changed, 5 insertions, 80 deletions

diff --git a/middleware/errors/errors.go b/middleware/errors/errors.go
index ef178d1a3..6f490ea74 100644
--- a/middleware/errors/errors.go
+++ b/middleware/errors/errors.go
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/roller"
 	"github.com/miekg/coredns/request"
 
 	"github.com/miekg/dns"
@@ -18,11 +17,10 @@ import (
 
 // ErrorHandler handles DNS errors (and errors from other middleware).
 type ErrorHandler struct {
-	Next      middleware.Handler
-	LogFile   string
-	Log       *log.Logger
-	LogRoller *roller.LogRoller
-	Debug     bool // if true, errors are written out to client rather than to a log
+	Next    middleware.Handler
+	LogFile string
+	Log     *log.Logger
+	Debug   bool // if true, errors are written out to client rather than to a log
 }
 
 func (h ErrorHandler) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
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 {
diff --git a/middleware/errors/setup_test.go b/middleware/errors/setup_test.go
index c1dbf7267..5b5108d42 100644
--- a/middleware/errors/setup_test.go
+++ b/middleware/errors/setup_test.go
@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	"github.com/mholt/caddy"
-	"github.com/miekg/coredns/middleware/pkg/roller"
 )
 
 func TestErrorsParse(t *testing.T) {
@@ -27,29 +26,6 @@ func TestErrorsParse(t *testing.T) {
 			LogFile: "",
 			Debug:   true,
 		}},
-		{`errors { log errors.txt { size 2 age 10 keep 3 } }`, false, ErrorHandler{
-			LogFile: "errors.txt",
-			LogRoller: &roller.LogRoller{
-				MaxSize:    2,
-				MaxAge:     10,
-				MaxBackups: 3,
-				LocalTime:  true,
-			},
-		}},
-		{`errors { log errors.txt {
-            size 3
-            age 11
-            keep 5
-        }
-}`, false, ErrorHandler{
-			LogFile: "errors.txt",
-			LogRoller: &roller.LogRoller{
-				MaxSize:    3,
-				MaxAge:     11,
-				MaxBackups: 5,
-				LocalTime:  true,
-			},
-		}},
 	}
 	for i, test := range tests {
 		c := caddy.NewTestController("dns", test.inputErrorsRules)
@@ -68,31 +44,5 @@ func TestErrorsParse(t *testing.T) {
 			t.Errorf("Test %d expected Debug to be %v, but got %v",
 				i, test.expectedErrorHandler.Debug, actualErrorsRule.Debug)
 		}
-		if actualErrorsRule.LogRoller != nil && test.expectedErrorHandler.LogRoller == nil || actualErrorsRule.LogRoller == nil && test.expectedErrorHandler.LogRoller != nil {
-			t.Fatalf("Test %d expected LogRoller to be %v, but got %v",
-				i, test.expectedErrorHandler.LogRoller, actualErrorsRule.LogRoller)
-		}
-		if actualErrorsRule.LogRoller != nil && test.expectedErrorHandler.LogRoller != nil {
-			if actualErrorsRule.LogRoller.Filename != test.expectedErrorHandler.LogRoller.Filename {
-				t.Fatalf("Test %d expected LogRoller Filename to be %s, but got %s",
-					i, test.expectedErrorHandler.LogRoller.Filename, actualErrorsRule.LogRoller.Filename)
-			}
-			if actualErrorsRule.LogRoller.MaxAge != test.expectedErrorHandler.LogRoller.MaxAge {
-				t.Fatalf("Test %d expected LogRoller MaxAge to be %d, but got %d",
-					i, test.expectedErrorHandler.LogRoller.MaxAge, actualErrorsRule.LogRoller.MaxAge)
-			}
-			if actualErrorsRule.LogRoller.MaxBackups != test.expectedErrorHandler.LogRoller.MaxBackups {
-				t.Fatalf("Test %d expected LogRoller MaxBackups to be %d, but got %d",
-					i, test.expectedErrorHandler.LogRoller.MaxBackups, actualErrorsRule.LogRoller.MaxBackups)
-			}
-			if actualErrorsRule.LogRoller.MaxSize != test.expectedErrorHandler.LogRoller.MaxSize {
-				t.Fatalf("Test %d expected LogRoller MaxSize to be %d, but got %d",
-					i, test.expectedErrorHandler.LogRoller.MaxSize, actualErrorsRule.LogRoller.MaxSize)
-			}
-			if actualErrorsRule.LogRoller.LocalTime != test.expectedErrorHandler.LogRoller.LocalTime {
-				t.Fatalf("Test %d expected LogRoller LocalTime to be %t, but got %t",
-					i, test.expectedErrorHandler.LogRoller.LocalTime, actualErrorsRule.LogRoller.LocalTime)
-			}
-		}
 	}
 }