From ab5ff44eb40b4be2f66ec9afcb647a170c2374ca Mon Sep 17 00:00:00 2001
From: Steffen Busch <37350514+steffenbusch@users.noreply.github.com>
Date: Fri, 8 Mar 2024 09:09:21 +0100
Subject: [PATCH] Changed {request>user_id} to {user_id}

---
 README.md        | 6 +++---
 formatencoder.go | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index c7bccf0..25daef5 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ The module comes with one special value of `{common_log}` for the Apache Common
 The more spelled out way of doing it is:
 
 ```caddyfile
-format transform `{request>remote_ip} - {request>user_id} [{ts}] "{request>method} {request>uri} {request>proto}" {status} {size}` {
+format transform `{request>remote_ip} - {user_id} [{ts}] "{request>method} {request>uri} {request>proto}" {status} {size}` {
 	time_format "02/Jan/2006:15:04:05 -0700"
 }
 ```
@@ -65,7 +65,7 @@ format transform `{request>remote_ip} - {request>user_id} [{ts}] "{request>metho
 The more spelled out way of doing it is:
 
 ```caddy
-format transform `{request>remote_ip} - {request>user_id} [{ts}] "{request>method} {request>uri} {request>proto}" {status} {size} "{request>headers>Referer>[0]}" "{request>headers>User-Agent>[0]}"` {
+format transform `{request>remote_ip} - {user_id} [{ts}] "{request>method} {request>uri} {request>proto}" {status} {size} "{request>headers>Referer>[0]}" "{request>headers>User-Agent>[0]}"` {
         time_format "02/Jan/2006:15:04:05 -0700"
 }
 ```
@@ -76,7 +76,7 @@ You can use an alternative value by using the following syntax `{val1:val2}`. Fo
 header as `remote_ip` replacement you can do the following
 
 ```caddy
-format transform `{request>headers>X-Forwarded-For>[0]:request>remote_ip} - {request>user_id} [{ts}] "{request>method} {request>uri} {request>proto}" {status} {size} "{request>headers>Referer>[0]}" "{request>headers>User-Agent>[0]}"` {
+format transform `{request>headers>X-Forwarded-For>[0]:request>remote_ip} - {user_id} [{ts}] "{request>method} {request>uri} {request>proto}" {status} {size} "{request>headers>Referer>[0]}" "{request>headers>User-Agent>[0]}"` {
         time_format "02/Jan/2006:15:04:05 -0700"
 }
 ```
diff --git a/formatencoder.go b/formatencoder.go
index 92458b2..02c82ca 100644
--- a/formatencoder.go
+++ b/formatencoder.go
@@ -33,7 +33,7 @@ func init() {
 const (
 	// commonLogFormat is the common log format. https://en.wikipedia.org/wiki/Common_Log_Format
 	commonLogEmptyValue = "-"
-	commonLogFormat     = `{request>remote_ip} ` + commonLogEmptyValue + ` {request>user_id} [{ts}] "{request>method} {request>uri} {request>proto}" {status} {size}`
+	commonLogFormat     = `{request>remote_ip} ` + commonLogEmptyValue + ` {user_id} [{ts}] "{request>method} {request>uri} {request>proto}" {status} {size}`
 	commonLogTimeFormat = "02/Jan/2006:15:04:05 -0700"
 
 	commonLogFormatShortcut = `{common_log}`