summaryrefslogtreecommitdiff
path: root/caddytest
diff options
context:
space:
mode:
authorFrancis Lavoie <lavofr@gmail.com>2021-11-29 01:18:35 -0500
committerGitHub <noreply@github.com>2021-11-29 01:18:35 -0500
commitf55b123d63132e290789bcd07077375c76b6e1dd (patch)
tree494cf4f8d85f48d5d3bc3a6e12d74d491710d6cd /caddytest
parent0eb0b60f47bddcf24f6af9265e60044033555ff2 (diff)
caddyhttp: Split up logged remote address into IP and port (#4403)
Diffstat (limited to 'caddytest')
-rw-r--r--caddytest/integration/caddyfile_adapt/global_options_log_custom.txt4
-rw-r--r--caddytest/integration/caddyfile_adapt/log_filters.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/caddytest/integration/caddyfile_adapt/global_options_log_custom.txt b/caddytest/integration/caddyfile_adapt/global_options_log_custom.txt
index e37e75e..b39cce9 100644
--- a/caddytest/integration/caddyfile_adapt/global_options_log_custom.txt
+++ b/caddytest/integration/caddyfile_adapt/global_options_log_custom.txt
@@ -3,7 +3,7 @@
format filter {
wrap console
fields {
- request>remote_addr ip_mask {
+ request>remote_ip ip_mask {
ipv4 24
ipv6 32
}
@@ -18,7 +18,7 @@
"custom-logger": {
"encoder": {
"fields": {
- "request\u003eremote_addr": {
+ "request\u003eremote_ip": {
"filter": "ip_mask",
"ipv4_cidr": 24,
"ipv6_cidr": 32
diff --git a/caddytest/integration/caddyfile_adapt/log_filters.txt b/caddytest/integration/caddyfile_adapt/log_filters.txt
index 1bef4c2..5253529 100644
--- a/caddytest/integration/caddyfile_adapt/log_filters.txt
+++ b/caddytest/integration/caddyfile_adapt/log_filters.txt
@@ -15,7 +15,7 @@ log {
replace foo REDACTED
delete bar
}
- request>remote_addr ip_mask {
+ request>remote_ip ip_mask {
ipv4 24
ipv6 32
}
@@ -64,7 +64,7 @@ log {
"request\u003eheaders\u003eServer": {
"filter": "delete"
},
- "request\u003eremote_addr": {
+ "request\u003eremote_ip": {
"filter": "ip_mask",
"ipv4_cidr": 24,
"ipv6_cidr": 32