From af26a03da1af7cd7d64fc03270961829d0311ed7 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Fri, 15 Nov 2019 17:01:07 -0700
Subject: [PATCH] http: Only enable access logs if configured

---
 modules/caddyhttp/caddyhttp.go      | 6 +++++-
 modules/caddyhttp/responsewriter.go | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/caddyhttp/caddyhttp.go b/modules/caddyhttp/caddyhttp.go
index 36d81542..78308280 100644
--- a/modules/caddyhttp/caddyhttp.go
+++ b/modules/caddyhttp/caddyhttp.go
@@ -76,9 +76,13 @@ func (app *App) Provision(ctx caddy.Context) error {
 
 	for srvName, srv := range app.Servers {
 		srv.logger = app.logger.Named("log")
-		srv.accessLogger = app.logger.Named("log.access")
 		srv.errorLogger = app.logger.Named("log.error")
 
+		// only enable access logs if configured
+		if srv.Logs != nil {
+			srv.accessLogger = app.logger.Named("log.access")
+		}
+
 		if srv.AutoHTTPS == nil {
 			// avoid nil pointer dereferences
 			srv.AutoHTTPS = new(AutoHTTPSConfig)
diff --git a/modules/caddyhttp/responsewriter.go b/modules/caddyhttp/responsewriter.go
index 5beb40ea..dd16ce7b 100644
--- a/modules/caddyhttp/responsewriter.go
+++ b/modules/caddyhttp/responsewriter.go
@@ -229,6 +229,7 @@ func (rr *responseRecorder) WriteResponse() error {
 	_, err := io.Copy(rr.ResponseWriterWrapper, rr.buf)
 	return err
 }
+
 // ResponseRecorder is a http.ResponseWriter that records
 // responses instead of writing them to the client. See
 // docs for NewResponseRecorder for proper usage.