summaryrefslogtreecommitdiffhomepage
path: root/caddyconfig
diff options
context:
space:
mode:
authorMatt Holt <[email protected]>2021-11-28 23:08:52 -0700
committerGitHub <[email protected]>2021-11-29 01:08:52 -0500
commit0eb0b60f47bddcf24f6af9265e60044033555ff2 (patch)
treebe0baddcdcc423069f5d8f5b228af46c15984592 /caddyconfig
parent5e5af50e64a33ecd9c91aaa773d4f8428945ac74 (diff)
downloadcaddy-0eb0b60f47bddcf24f6af9265e60044033555ff2.tar.gz
caddy-0eb0b60f47bddcf24f6af9265e60044033555ff2.zip
logging: Remove common_log field and single_field encoder (#4149) (#4282)
Diffstat (limited to 'caddyconfig')
-rw-r--r--caddyconfig/httpcaddyfile/builtins_test.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/caddyconfig/httpcaddyfile/builtins_test.go b/caddyconfig/httpcaddyfile/builtins_test.go
index 496238301..a28229b41 100644
--- a/caddyconfig/httpcaddyfile/builtins_test.go
+++ b/caddyconfig/httpcaddyfile/builtins_test.go
@@ -37,7 +37,6 @@ func TestLogDirectiveSyntax(t *testing.T) {
format filter {
wrap console
fields {
- common_log delete
request>remote_addr ip_mask {
ipv4 24
ipv6 32
@@ -47,7 +46,7 @@ func TestLogDirectiveSyntax(t *testing.T) {
}
}
`,
- output: `{"logging":{"logs":{"default":{"exclude":["http.log.access.log0"]},"log0":{"encoder":{"fields":{"common_log":{"filter":"delete"},"request\u003eremote_addr":{"filter":"ip_mask","ipv4_cidr":24,"ipv6_cidr":32}},"format":"filter","wrap":{"format":"console"}},"include":["http.log.access.log0"]}}},"apps":{"http":{"servers":{"srv0":{"listen":[":8080"],"logs":{"default_logger_name":"log0"}}}}}}`,
+ output: `{"logging":{"logs":{"default":{"exclude":["http.log.access.log0"]},"log0":{"encoder":{"fields":{"request\u003eremote_addr":{"filter":"ip_mask","ipv4_cidr":24,"ipv6_cidr":32}},"format":"filter","wrap":{"format":"console"}},"include":["http.log.access.log0"]}}},"apps":{"http":{"servers":{"srv0":{"listen":[":8080"],"logs":{"default_logger_name":"log0"}}}}}}`,
expectError: false,
},
{