From 0bf2565c37c0b2e4857be70c5302d6ad5c34b80d Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Tue, 7 Jul 2020 08:11:35 -0600 Subject: caddyhttp: Reorder some access log fields; add host matcher test case This field order reads a little more naturally. --- modules/caddyhttp/marshalers.go | 6 +++--- modules/caddyhttp/matchers_test.go | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/caddyhttp/marshalers.go b/modules/caddyhttp/marshalers.go index e35a73e..7f95923 100644 --- a/modules/caddyhttp/marshalers.go +++ b/modules/caddyhttp/marshalers.go @@ -26,11 +26,11 @@ type LoggableHTTPRequest struct{ *http.Request } // MarshalLogObject satisfies the zapcore.ObjectMarshaler interface. func (r LoggableHTTPRequest) MarshalLogObject(enc zapcore.ObjectEncoder) error { - enc.AddString("method", r.Method) - enc.AddString("uri", r.RequestURI) - enc.AddString("proto", r.Proto) enc.AddString("remote_addr", r.RemoteAddr) + enc.AddString("proto", r.Proto) + enc.AddString("method", r.Method) enc.AddString("host", r.Host) + enc.AddString("uri", r.RequestURI) enc.AddObject("headers", LoggableHTTPHeader(r.Header)) if r.TLS != nil { enc.AddObject("tls", LoggableTLSConnState(*r.TLS)) diff --git a/modules/caddyhttp/matchers_test.go b/modules/caddyhttp/matchers_test.go index 883680f..9a2836d 100644 --- a/modules/caddyhttp/matchers_test.go +++ b/modules/caddyhttp/matchers_test.go @@ -122,6 +122,11 @@ func TestHostMatcher(t *testing.T) { input: "sub.foo.example.net", expect: false, }, + { + match: MatchHost{"www.*.*"}, + input: "www.example.com", + expect: true, + }, { match: MatchHost{"example.com"}, input: "example.com:5555", -- cgit v1.2.3