summaryrefslogtreecommitdiff
path: root/modules/caddyhttp/reverseproxy
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2020-05-18 13:50:40 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2020-05-18 13:50:46 -0600
commit812278acd8a5c46b44fdf92ea5df4d6a51eff7be (patch)
treeb3f740a1e8c6490a373236ada70497415cd2e15f /modules/caddyhttp/reverseproxy
parentc47ddbeffb0457d4ac7f65d89f77abae817df239 (diff)
reverseproxy: Emit debug log before checking error (#3425)
This way the upstream request will always be available even if it failed
Diffstat (limited to 'modules/caddyhttp/reverseproxy')
-rw-r--r--modules/caddyhttp/reverseproxy/reverseproxy.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/caddyhttp/reverseproxy/reverseproxy.go b/modules/caddyhttp/reverseproxy/reverseproxy.go
index 0b4bcdf..52d230c 100644
--- a/modules/caddyhttp/reverseproxy/reverseproxy.go
+++ b/modules/caddyhttp/reverseproxy/reverseproxy.go
@@ -465,10 +465,6 @@ func (h *Handler) reverseProxy(rw http.ResponseWriter, req *http.Request, di Dia
start := time.Now()
res, err := h.Transport.RoundTrip(req)
duration := time.Since(start)
- if err != nil {
- return err
- }
-
h.logger.Debug("upstream roundtrip",
zap.String("upstream", di.Upstream.String()),
zap.Object("request", caddyhttp.LoggableHTTPRequest{Request: req}),
@@ -476,6 +472,9 @@ func (h *Handler) reverseProxy(rw http.ResponseWriter, req *http.Request, di Dia
zap.Duration("duration", duration),
zap.Int("status", res.StatusCode),
)
+ if err != nil {
+ return err
+ }
// update circuit breaker on current conditions
if di.Upstream.cb != nil {