Skip to content

Commit

Permalink
1.1 backport via (#533)
Browse files Browse the repository at this point in the history
* fix health check header append defect

* increment version
  • Loading branch information
James Ranson authored Feb 4, 2021
1 parent ffda1fa commit 4595bd6
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cmd/trickster/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var (

const (
applicationName = "trickster"
applicationVersion = "1.1.4"
applicationVersion = "1.1.5"
)

var fatalStartupErrors = true
Expand Down
2 changes: 1 addition & 1 deletion pkg/proxy/origins/clickhouse/handler_health.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func (c *Client) HealthHandler(w http.ResponseWriter, r *http.Request) {
rsc := request.GetResources(r)
req = req.WithContext(tctx.WithHealthCheckFlag(tctx.WithResources(context.Background(), rsc), true))

req.Header = c.healthHeaders
req.Header = c.healthHeaders.Clone()
engines.DoProxy(w, req, true)

}
Expand Down
2 changes: 1 addition & 1 deletion pkg/proxy/origins/irondb/handler_health.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (c *Client) HealthHandler(w http.ResponseWriter, r *http.Request) {
rsc := request.GetResources(r)
req = req.WithContext(tctx.WithHealthCheckFlag(tctx.WithResources(context.Background(), rsc), true))

req.Header = c.healthHeaders
req.Header = c.healthHeaders.Clone()
engines.DoProxy(w, req, true)

}
Expand Down
2 changes: 1 addition & 1 deletion pkg/proxy/origins/prometheus/handler_health.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func (c *Client) HealthHandler(w http.ResponseWriter, r *http.Request) {
rsc := request.GetResources(r)
req = req.WithContext(tctx.WithHealthCheckFlag(tctx.WithResources(context.Background(), rsc), true))

req.Header = c.healthHeaders
req.Header = c.healthHeaders.Clone()
engines.DoProxy(w, req, true)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/proxy/origins/reverseproxycache/handler_health.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (c *Client) HealthHandler(w http.ResponseWriter, r *http.Request) {
rsc := request.GetResources(r)
req = req.WithContext(tctx.WithHealthCheckFlag(tctx.WithResources(context.Background(), rsc), true))

req.Header = c.healthHeaders
req.Header = c.healthHeaders.Clone()
engines.DoProxy(w, req, true)
}

Expand Down

0 comments on commit 4595bd6

Please sign in to comment.