From 9ee01dceac0a3e9f71c3b37dfbe3ae04e2f54986 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Mon, 18 May 2020 14:08:11 -0600 Subject: reverseproxy: Make debug log safe if error occurs --- modules/caddyhttp/reverseproxy/reverseproxy.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'modules/caddyhttp') diff --git a/modules/caddyhttp/reverseproxy/reverseproxy.go b/modules/caddyhttp/reverseproxy/reverseproxy.go index 52d230c..3bf881e 100644 --- a/modules/caddyhttp/reverseproxy/reverseproxy.go +++ b/modules/caddyhttp/reverseproxy/reverseproxy.go @@ -461,20 +461,24 @@ func (h *Handler) reverseProxy(rw http.ResponseWriter, req *http.Request, di Dia // point the request to this upstream h.directRequest(req, di) - // do the round-trip + // do the round-trip; emit debug log with values we know are + // safe, or if there is no error, emit fuller log entry start := time.Now() res, err := h.Transport.RoundTrip(req) duration := time.Since(start) - h.logger.Debug("upstream roundtrip", + logger := h.logger.With( zap.String("upstream", di.Upstream.String()), zap.Object("request", caddyhttp.LoggableHTTPRequest{Request: req}), - zap.Object("headers", caddyhttp.LoggableHTTPHeader(res.Header)), zap.Duration("duration", duration), - zap.Int("status", res.StatusCode), ) if err != nil { + logger.Debug("upstream roundtrip", zap.Error(err)) return err } + logger.Debug("upstream roundtrip", + zap.Object("headers", caddyhttp.LoggableHTTPHeader(res.Header)), + zap.Int("status", res.StatusCode), + ) // update circuit breaker on current conditions if di.Upstream.cb != nil { -- cgit v1.2.3