diff options
| author | Matthew Holt <mholt@users.noreply.github.com> | 2019-10-11 14:25:39 -0600 | 
|---|---|---|
| committer | Matthew Holt <mholt@users.noreply.github.com> | 2019-10-11 14:25:39 -0600 | 
| commit | 1e31be8de0d1d5587348619225456a793cb30f7f (patch) | |
| tree | fa3fca930b8ae02649471698950a60cce8afc539 /modules/caddyhttp/reverseproxy/healthchecks.go | |
| parent | 4aa3af4b78addcf65ce6b254be10f006bae1c9ac (diff) | |
reverse_proxy: Allow dynamic backends (closes #990 and #1539)
This PR enables the use of placeholders in an upstream's Dial address.
A Dial address must represent precisely one socket after replacements.
See also #998 and #1639.
Diffstat (limited to 'modules/caddyhttp/reverseproxy/healthchecks.go')
| -rw-r--r-- | modules/caddyhttp/reverseproxy/healthchecks.go | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/caddyhttp/reverseproxy/healthchecks.go b/modules/caddyhttp/reverseproxy/healthchecks.go index be532ea..a64c21d 100644 --- a/modules/caddyhttp/reverseproxy/healthchecks.go +++ b/modules/caddyhttp/reverseproxy/healthchecks.go @@ -115,7 +115,7 @@ func (h *Handler) doActiveHealthChecksForAllHosts() {  				// so use a fake Host value instead; unix sockets are usually local  				hostAddr = "localhost"  			} -			err = h.doActiveHealthCheck(NewDialInfo(network, addrs[0]), hostAddr, host) +			err = h.doActiveHealthCheck(DialInfo{Network: network, Address: addrs[0]}, hostAddr, host)  			if err != nil {  				log.Printf("[ERROR] reverse_proxy: active health check for host %s: %v", networkAddr, err)  			} @@ -259,7 +259,7 @@ func (h *Handler) countFailure(upstream *Upstream) {  	err := upstream.Host.CountFail(1)  	if err != nil {  		log.Printf("[ERROR] proxy: upstream %s: counting failure: %v", -			upstream.dialInfo, err) +			upstream.Dial, err)  	}  	// forget it later @@ -268,7 +268,7 @@ func (h *Handler) countFailure(upstream *Upstream) {  		err := host.CountFail(-1)  		if err != nil {  			log.Printf("[ERROR] proxy: upstream %s: expiring failure: %v", -				upstream.dialInfo, err) +				upstream.Dial, err)  		}  	}(upstream.Host, failDuration)  }  | 
