From 9b74a53e510d395e0cbe617a29db6de9828388b8 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Fri, 7 Feb 2025 06:23:43 -0700
Subject: [PATCH] Revert "logging: Always set fields func; fix #6829"
This reverts commit 932dac157a3c4693b80576477498bb86208b9b30.
Somehow the code I was looking at changed when I committed, without realizing it. This has already been fixed in #6777.
---
modules/caddyhttp/logging.go | 1 -
modules/caddyhttp/server.go | 1 -
2 files changed, 2 deletions(-)
diff --git a/modules/caddyhttp/logging.go b/modules/caddyhttp/logging.go
index cef9ea139..87298ac3c 100644
--- a/modules/caddyhttp/logging.go
+++ b/modules/caddyhttp/logging.go
@@ -195,7 +195,6 @@ func (sa *StringArray) UnmarshalJSON(b []byte) error {
// have richer information.
func errLogValues(err error) (status int, msg string, fields func() []zapcore.Field) {
var handlerErr HandlerError
- fields = func() []zapcore.Field { return []zapcore.Field{} } // don't be nil (fix #6829)
if errors.As(err, &handlerErr) {
status = handlerErr.StatusCode
if handlerErr.Err == nil {
diff --git a/modules/caddyhttp/server.go b/modules/caddyhttp/server.go
index 12c032dee..a2b29d658 100644
--- a/modules/caddyhttp/server.go
+++ b/modules/caddyhttp/server.go
@@ -408,7 +408,6 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if fields == nil {
fields = errFields()
}
-
c.Write(fields...)
}
}