Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-01 02:33:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Fixes #1776
This commit is contained in:
Miek Gieben
2018-05-10 03:04:46 +01:00
committed by Yong Tang
parent 5e7c399117
commit 874a998697
4 changed files with 16 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugin/errors/setup_test.go
View File

@@ -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)
}
}
}