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

Merge pull request #2639 from tanuck/master 

Standardize the case of all check log messages
This commit is contained in:
James Phillips 2017-01-17 09:07:45 -08:00 committed by GitHub
parent 85bd8a9b88 5b526f0847
commit 17c4754eac
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
command/agent/check.go
View File

@ -197,7 +197,7 @@ func (c *CheckMonitor) check() {
output.Size(), output.TotalWritten(), outputStr) output.Size(), output.TotalWritten(), outputStr)
} }
c.Logger.Printf("[DEBUG] agent: check '%s' script '%s' output: %s", c.Logger.Printf("[DEBUG] agent: Check '%s' script '%s' output: %s",
c.CheckID, c.Script, outputStr) c.CheckID, c.Script, outputStr)
// Check if the check passed // Check if the check passed
@ -441,7 +441,7 @@ func (c *CheckHTTP) check() {
// Read the response into a circular buffer to limit the size // Read the response into a circular buffer to limit the size
output, _ := circbuf.NewBuffer(CheckBufSize) output, _ := circbuf.NewBuffer(CheckBufSize)
if _, err := io.Copy(output, resp.Body); err != nil { if _, err := io.Copy(output, resp.Body); err != nil {
c.Logger.Printf("[WARN] agent: check '%v': Get error while reading body: %s", c.CheckID, err) c.Logger.Printf("[WARN] agent: Check '%v': Get error while reading body: %s", c.CheckID, err)
} }
// Format the response body // Format the response body
@ -449,19 +449,19 @@ func (c *CheckHTTP) check() {
if resp.StatusCode >= 200 && resp.StatusCode <= 299 { if resp.StatusCode >= 200 && resp.StatusCode <= 299 {
// PASSING (2xx) // PASSING (2xx)
c.Logger.Printf("[DEBUG] agent: check '%v' is passing", c.CheckID) c.Logger.Printf("[DEBUG] agent: Check '%v' is passing", c.CheckID)
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 {
// WARNING // WARNING
// 429 Too Many Requests (RFC 6585) // 429 Too Many Requests (RFC 6585)
// The user has sent too many requests in a given amount of time. // The user has sent too many requests in a given amount of time.
c.Logger.Printf("[WARN] agent: check '%v' is now warning", c.CheckID) c.Logger.Printf("[WARN] agent: Check '%v' is now warning", c.CheckID)
c.Notify.UpdateCheck(c.CheckID, structs.HealthWarning, result) c.Notify.UpdateCheck(c.CheckID, structs.HealthWarning, result)
} else { } else {
// CRITICAL // CRITICAL
c.Logger.Printf("[WARN] agent: check '%v' is now critical", c.CheckID) c.Logger.Printf("[WARN] agent: Check '%v' is now critical", c.CheckID)
c.Notify.UpdateCheck(c.CheckID, structs.HealthCritical, result) c.Notify.UpdateCheck(c.CheckID, structs.HealthCritical, result)
} }
} }
@ -545,7 +545,7 @@ func (c *CheckTCP) check() {
return return
} }
conn.Close() conn.Close()
c.Logger.Printf("[DEBUG] agent: check '%v' is passing", c.CheckID) c.Logger.Printf("[DEBUG] agent: Check '%v' is passing", c.CheckID)
c.Notify.UpdateCheck(c.CheckID, structs.HealthPassing, fmt.Sprintf("TCP connect %s: Success", c.TCP)) c.Notify.UpdateCheck(c.CheckID, structs.HealthPassing, fmt.Sprintf("TCP connect %s: Success", c.TCP))
} }
@ -671,7 +671,7 @@ func (c *CheckDocker) check() {
output.Size(), output.TotalWritten(), outputStr) output.Size(), output.TotalWritten(), outputStr)
} }
c.Logger.Printf("[DEBUG] agent: check '%s' script '%s' output: %s", c.Logger.Printf("[DEBUG] agent: Check '%s' script '%s' output: %s",
c.CheckID, c.Script, outputStr) c.CheckID, c.Script, outputStr)
execInfo, err := c.dockerClient.InspectExec(exec.ID) execInfo, err := c.dockerClient.InspectExec(exec.ID)