Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-30 22:34:15 -05:00
Code Issues Activity

reverseproxy: Add ID field for upstreams

Browse source
This commit is contained in:
Francis Lavoie 2021-09-12 23:50:04 -04:00
parent a779e1b383
commit a5f4fae145
No known key found for this signature in database
GPG key ID: E73DB3ECE64E7885
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/caddyhttp/reverseproxy/admin.go
View file

@ -34,7 +34,8 @@ type adminUpstreams struct{}
// upstreamResults holds the status of a particular upstream // upstreamResults holds the status of a particular upstream
type upstreamStatus struct { type upstreamStatus struct {
Address string `json:"address"` ID string `json:"id"`
Address string `json:"address"` // Address is deprecated, should be removed in a future release.
Healthy bool `json:"healthy"` Healthy bool `json:"healthy"`
NumRequests int `json:"num_requests"` NumRequests int `json:"num_requests"`
Fails int `json:"fails"` Fails int `json:"fails"`
@ -78,7 +79,7 @@ func (adminUpstreams) handleUpstreams(w http.ResponseWriter, r *http.Request) er
// Iterate over the upstream pool (needs to be fast) // Iterate over the upstream pool (needs to be fast)
var rangeErr error var rangeErr error
hosts.Range(func(key, val interface{}) bool { hosts.Range(func(key, val interface{}) bool {
address, ok := key.(string) id, ok := key.(string)
if !ok { if !ok {
rangeErr = caddy.APIError{ rangeErr = caddy.APIError{
HTTPStatus: http.StatusInternalServerError, HTTPStatus: http.StatusInternalServerError,
@ -97,7 +98,8 @@ func (adminUpstreams) handleUpstreams(w http.ResponseWriter, r *http.Request) er
} }
results = append(results, upstreamStatus{ results = append(results, upstreamStatus{
Address: address, ID: id,
Address: id,
Healthy: !upstream.Unhealthy(), Healthy: !upstream.Unhealthy(),
NumRequests: upstream.NumRequests(), NumRequests: upstream.NumRequests(),
Fails: upstream.Fails(), Fails: upstream.Fails(),

9
modules/caddyhttp/reverseproxy/hosts.go
View file

@ -65,6 +65,12 @@ type UpstreamPool []*Upstream
type Upstream struct { type Upstream struct {
Host `json:"-"` Host `json:"-"`
// The unique ID for this upstream, to disambiguate multiple
// upstreams with the same Dial address. This is optional,
// and only necessary if the upstream states need to be
// separate, such as having different health checking policies.
ID string `json:"id,omitempty"`
// The [network address](/docs/conventions#network-addresses) // The [network address](/docs/conventions#network-addresses)
// to dial to connect to the upstream. Must represent precisely // to dial to connect to the upstream. Must represent precisely
// one socket (i.e. no port ranges). A valid network address // one socket (i.e. no port ranges). A valid network address
@ -98,6 +104,9 @@ type Upstream struct {
} }
func (u Upstream) String() string { func (u Upstream) String() string {
if u.ID != "" {
return u.ID
}
if u.LookupSRV != "" { if u.LookupSRV != "" {
return u.LookupSRV return u.LookupSRV
} }