logging: Prep for common_log removal

See #4148 (comment)
caddyserver · May 6, 2021 · 636dc4c · 636dc4c
1 parent d4b2f1b
commit 636dc4c
Show file tree

Hide file tree

Showing 2 changed files with 357 additions and 352 deletions.
diff --git a/modules/caddyhttp/server.go b/modules/caddyhttp/server.go
@@ -184,8 +184,11 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				log = logger.Error
 			}
 
+			userID, _ := repl.GetString("http.auth.user.id")
+
 			log("handled request",
 				zap.String("common_log", repl.ReplaceAll(commonLogFormat, commonLogEmptyValue)),
+				zap.String("user_id", userID),
 				zap.Duration("duration", duration),
 				zap.Int("size", wrec.Size()),
 				zap.Int("status", wrec.Status()),