From 87b6cf470baacd659cd20815de2804ae4a31df7f Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Thu, 12 Dec 2019 14:31:20 -0700 Subject: Minor improvements; comments and shorter placeholders & module IDs --- modules/caddyhttp/reverseproxy/caddyfile.go | 4 ++-- modules/caddyhttp/reverseproxy/command.go | 2 +- modules/caddyhttp/reverseproxy/reverseproxy.go | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'modules/caddyhttp/reverseproxy') diff --git a/modules/caddyhttp/reverseproxy/caddyfile.go b/modules/caddyhttp/reverseproxy/caddyfile.go index 9dba769..c9afa2a 100644 --- a/modules/caddyhttp/reverseproxy/caddyfile.go +++ b/modules/caddyhttp/reverseproxy/caddyfile.go @@ -106,7 +106,7 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { return d.Err("load balancing selection policy already specified") } name := d.Val() - mod, err := caddy.GetModule("http.handlers.reverse_proxy.selection_policies." + name) + mod, err := caddy.GetModule("http.reverse_proxy.selection_policies." + name) if err != nil { return d.Errf("getting load balancing policy module '%s': %v", mod, err) } @@ -389,7 +389,7 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { return d.Err("transport already specified") } name := d.Val() - mod, err := caddy.GetModule("http.handlers.reverse_proxy.transport." + name) + mod, err := caddy.GetModule("http.reverse_proxy.transport." + name) if err != nil { return d.Errf("getting transport module '%s': %v", mod, err) } diff --git a/modules/caddyhttp/reverseproxy/command.go b/modules/caddyhttp/reverseproxy/command.go index e16c4f5..1638d82 100644 --- a/modules/caddyhttp/reverseproxy/command.go +++ b/modules/caddyhttp/reverseproxy/command.go @@ -100,7 +100,7 @@ func cmdReverseProxy(fs caddycmd.Flags) (int, error) { Headers: &headers.Handler{ Request: &headers.HeaderOps{ Set: http.Header{ - "Host": []string{"{http.handlers.reverse_proxy.upstream.host}"}, + "Host": []string{"{http.reverse_proxy.upstream.host}"}, }, }, }, diff --git a/modules/caddyhttp/reverseproxy/reverseproxy.go b/modules/caddyhttp/reverseproxy/reverseproxy.go index 132f222..d353dc1 100644 --- a/modules/caddyhttp/reverseproxy/reverseproxy.go +++ b/modules/caddyhttp/reverseproxy/reverseproxy.go @@ -288,13 +288,13 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyht r = r.WithContext(ctx) // set placeholders with information about this upstream - repl.Set("http.handlers.reverse_proxy.upstream.address", dialInfo.String()) - repl.Set("http.handlers.reverse_proxy.upstream.hostport", dialInfo.Address) - repl.Set("http.handlers.reverse_proxy.upstream.host", dialInfo.Host) - repl.Set("http.handlers.reverse_proxy.upstream.port", dialInfo.Port) - repl.Set("http.handlers.reverse_proxy.upstream.requests", strconv.Itoa(upstream.Host.NumRequests())) - repl.Set("http.handlers.reverse_proxy.upstream.max_requests", strconv.Itoa(upstream.MaxRequests)) - repl.Set("http.handlers.reverse_proxy.upstream.fails", strconv.Itoa(upstream.Host.Fails())) + repl.Set("http.reverse_proxy.upstream.address", dialInfo.String()) + repl.Set("http.reverse_proxy.upstream.hostport", dialInfo.Address) + repl.Set("http.reverse_proxy.upstream.host", dialInfo.Host) + repl.Set("http.reverse_proxy.upstream.port", dialInfo.Port) + repl.Set("http.reverse_proxy.upstream.requests", strconv.Itoa(upstream.Host.NumRequests())) + repl.Set("http.reverse_proxy.upstream.max_requests", strconv.Itoa(upstream.MaxRequests)) + repl.Set("http.reverse_proxy.upstream.fails", strconv.Itoa(upstream.Host.Fails())) // mutate request headers according to this upstream; // because we're in a retry loop, we have to copy -- cgit v1.2.3