mirror of
				https://github.com/coredns/coredns.git
				synced 2025-11-03 18:53:13 -05:00 
			
		
		
		
	* 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>
		
			
				
	
	
		
			99 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			99 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
package log
 | 
						|
 | 
						|
import (
 | 
						|
	"testing"
 | 
						|
 | 
						|
	"github.com/mholt/caddy"
 | 
						|
)
 | 
						|
 | 
						|
func TestLogParse(t *testing.T) {
 | 
						|
	tests := []struct {
 | 
						|
		inputLogRules    string
 | 
						|
		shouldErr        bool
 | 
						|
		expectedLogRules []Rule
 | 
						|
	}{
 | 
						|
		{`log`, false, []Rule{{
 | 
						|
			NameScope:  ".",
 | 
						|
			OutputFile: DefaultLogFilename,
 | 
						|
			Format:     DefaultLogFormat,
 | 
						|
		}}},
 | 
						|
		{`log log.txt`, false, []Rule{{
 | 
						|
			NameScope:  ".",
 | 
						|
			OutputFile: "log.txt",
 | 
						|
			Format:     DefaultLogFormat,
 | 
						|
		}}},
 | 
						|
		{`log example.org log.txt`, false, []Rule{{
 | 
						|
			NameScope:  "example.org.",
 | 
						|
			OutputFile: "log.txt",
 | 
						|
			Format:     DefaultLogFormat,
 | 
						|
		}}},
 | 
						|
		{`log example.org. stdout`, false, []Rule{{
 | 
						|
			NameScope:  "example.org.",
 | 
						|
			OutputFile: "stdout",
 | 
						|
			Format:     DefaultLogFormat,
 | 
						|
		}}},
 | 
						|
		{`log example.org log.txt {common}`, false, []Rule{{
 | 
						|
			NameScope:  "example.org.",
 | 
						|
			OutputFile: "log.txt",
 | 
						|
			Format:     CommonLogFormat,
 | 
						|
		}}},
 | 
						|
		{`log example.org accesslog.txt {combined}`, false, []Rule{{
 | 
						|
			NameScope:  "example.org.",
 | 
						|
			OutputFile: "accesslog.txt",
 | 
						|
			Format:     CombinedLogFormat,
 | 
						|
		}}},
 | 
						|
		{`log example.org. log.txt
 | 
						|
		  log example.net accesslog.txt {combined}`, false, []Rule{{
 | 
						|
			NameScope:  "example.org.",
 | 
						|
			OutputFile: "log.txt",
 | 
						|
			Format:     DefaultLogFormat,
 | 
						|
		}, {
 | 
						|
			NameScope:  "example.net.",
 | 
						|
			OutputFile: "accesslog.txt",
 | 
						|
			Format:     CombinedLogFormat,
 | 
						|
		}}},
 | 
						|
		{`log example.org stdout {host}
 | 
						|
		  log example.org log.txt {when}`, false, []Rule{{
 | 
						|
			NameScope:  "example.org.",
 | 
						|
			OutputFile: "stdout",
 | 
						|
			Format:     "{host}",
 | 
						|
		}, {
 | 
						|
			NameScope:  "example.org.",
 | 
						|
			OutputFile: "log.txt",
 | 
						|
			Format:     "{when}",
 | 
						|
		}}},
 | 
						|
	}
 | 
						|
	for i, test := range tests {
 | 
						|
		c := caddy.NewTestController("dns", test.inputLogRules)
 | 
						|
		actualLogRules, err := logParse(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 len(actualLogRules) != len(test.expectedLogRules) {
 | 
						|
			t.Fatalf("Test %d expected %d no of Log rules, but got %d ",
 | 
						|
				i, len(test.expectedLogRules), len(actualLogRules))
 | 
						|
		}
 | 
						|
		for j, actualLogRule := range actualLogRules {
 | 
						|
 | 
						|
			if actualLogRule.NameScope != test.expectedLogRules[j].NameScope {
 | 
						|
				t.Errorf("Test %d expected %dth LogRule NameScope to be  %s  , but got %s",
 | 
						|
					i, j, test.expectedLogRules[j].NameScope, actualLogRule.NameScope)
 | 
						|
			}
 | 
						|
 | 
						|
			if actualLogRule.OutputFile != test.expectedLogRules[j].OutputFile {
 | 
						|
				t.Errorf("Test %d expected %dth LogRule OutputFile to be  %s  , but got %s",
 | 
						|
					i, j, test.expectedLogRules[j].OutputFile, actualLogRule.OutputFile)
 | 
						|
			}
 | 
						|
 | 
						|
			if actualLogRule.Format != test.expectedLogRules[j].Format {
 | 
						|
				t.Errorf("Test %d expected %dth LogRule Format to be  %s  , but got %s",
 | 
						|
					i, j, test.expectedLogRules[j].Format, actualLogRule.Format)
 | 
						|
			}
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
}
 |