status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #951 from carlanton/http-user-agent 

Set the User Agent for HTTP health checks
This commit is contained in:
Armon Dadgar 2015-05-18 13:58:35 -07:00
parent 9417fd3768 ce93fdd76b
commit e05431323e
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
command/agent/check.go
View File

@ -23,6 +23,10 @@ const (
// last CheckBufSize. Prevents an enormous buffer // last CheckBufSize. Prevents an enormous buffer
// from being captured // from being captured
CheckBufSize = 4 * 1024 // 4KB CheckBufSize = 4 * 1024 // 4KB
// Use this user agent when doing requests for
// HTTP health checks.
HttpUserAgent = "Consul Health Check"
) )
// CheckType is used to create either the CheckMonitor // CheckType is used to create either the CheckMonitor
@ -344,7 +348,16 @@ func (c *CheckHTTP) run() {
// check is invoked periodically to perform the HTTP check // check is invoked periodically to perform the HTTP check
func (c *CheckHTTP) check() { func (c *CheckHTTP) check() {
resp, err := c.httpClient.Get(c.HTTP) req, err := http.NewRequest("GET", c.HTTP, nil)
if err != nil {
c.Logger.Printf("[WARN] agent: http request failed '%s': %s", c.HTTP, err)
c.Notify.UpdateCheck(c.CheckID, structs.HealthCritical, err.Error())
return
}
req.Header.Set("User-Agent", HttpUserAgent)
resp, err := c.httpClient.Do(req)
if err != nil { if err != nil {
c.Logger.Printf("[WARN] agent: http request failed '%s': %s", c.HTTP, err) c.Logger.Printf("[WARN] agent: http request failed '%s': %s", c.HTTP, err)
c.Notify.UpdateCheck(c.CheckID, structs.HealthCritical, err.Error()) c.Notify.UpdateCheck(c.CheckID, structs.HealthCritical, err.Error())