luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

command/agent: HTTP Check: Include response in check status

This commit is contained in:
Nicholas Capo 2015-01-12 22:35:28 +00:00
parent f26a79c325
commit 27fe823fd2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
command/agent/check.go
View File

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"github.com/armon/circbuf" "github.com/armon/circbuf"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"io/ioutil"
"log" "log"
"net/http" "net/http"
"os/exec" "os/exec"
@ -319,12 +320,17 @@ func (c *CheckHTTP) check() {
c.Notify.UpdateCheck(c.CheckID, structs.HealthCritical, err.Error()) c.Notify.UpdateCheck(c.CheckID, structs.HealthCritical, err.Error())
return return
} }
resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode >= 200 && resp.StatusCode <= 299 { if resp.StatusCode >= 200 && resp.StatusCode <= 299 {
// PASSING (2xx) // PASSING (2xx)
c.Logger.Printf("[DEBUG] http check '%v' is passing", c.CheckID) body, err := ioutil.ReadAll(resp.Body)
result := fmt.Sprintf("%s from %s", resp.Status, c.HTTP) if err != nil {
c.Logger.Printf("[WARN] check '%v': Get error while reading body: %s", c.CheckID, err)
body = []byte{}
}
result := fmt.Sprintf("HTTP GET %s: %s Output: %s", c.HTTP, resp.Status, body)
c.Logger.Printf("[DEBUG] agent: http check '%v' is passing: %s", c.CheckID, result)
c.Notify.UpdateCheck(c.CheckID, structs.HealthPassing, result) c.Notify.UpdateCheck(c.CheckID, structs.HealthPassing, result)
} else if resp.StatusCode == 429 { } else if resp.StatusCode == 429 {