plugin/errors: remove panic/recover (#1777)

Remove panic/recover and also use pkg/log to print the error. This
brings some consistency into the logging.

Fixes #1776

1 files changed, 10 insertions, 15 deletions

diff --git a/plugin/errors/setup_test.go b/plugin/errors/setup_test.go
index da7c251d5..3cfd7c03c 100644
--- a/plugin/errors/setup_test.go
+++ b/plugin/errors/setup_test.go
@@ -8,31 +8,26 @@ import (
 
 func TestErrorsParse(t *testing.T) {
 	tests := []struct {
-		inputErrorsRules     string
-		shouldErr            bool
-		expectedErrorHandler errorHandler
+		inputErrorsRules string
+		shouldErr        bool
 	}{
-		{`errors`, false, errorHandler{LogFile: "stdout"}},
-		{`errors stdout`, false, errorHandler{LogFile: "stdout"}},
-		{`errors errors.txt`, true, errorHandler{LogFile: ""}},
-		{`errors visible`, true, errorHandler{LogFile: ""}},
-		{`errors { log visible }`, true, errorHandler{LogFile: "stdout"}},
+		{`errors`, false},
+		{`errors stdout`, false},
+		{`errors errors.txt`, true},
+		{`errors visible`, true},
+		{`errors { log visible }`, true},
 		{`errors
-		errors `, true, errorHandler{LogFile: "stdout"}},
-		{`errors a b`, true, errorHandler{LogFile: ""}},
+		errors `, true},
+		{`errors a b`, true},
 	}
 	for i, test := range tests {
 		c := caddy.NewTestController("dns", test.inputErrorsRules)
-		actualErrorsRule, err := errorsParse(c)
+		_, err := errorsParse(c)
 
 		if err == nil && test.shouldErr {
 			t.Errorf("Test %d didn't error, but it should have", i)
 		} else if err != nil && !test.shouldErr {
 			t.Errorf("Test %d errored, but it shouldn't have; got '%v'", i, err)
 		}
-		if actualErrorsRule.LogFile != test.expectedErrorHandler.LogFile {
-			t.Errorf("Test %d expected LogFile to be %s, but got %s",
-				i, test.expectedErrorHandler.LogFile, actualErrorsRule.LogFile)
-		}
 	}
 }