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

Merge pull request #1270 from mpuncel/mpuncel/log-http-method 

Add http method to log output
This commit is contained in:
Ryan Breen 2015-10-02 21:49:40 -04:00
parent 6dbe404d37 a94589ad67
commit 5e49ba044e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
command/agent/http.go
View File

@ -302,14 +302,14 @@ func (s *HTTPServer) wrap(handler func(resp http.ResponseWriter, req *http.Reque
// Invoke the handler // Invoke the handler
start := time.Now() start := time.Now()
defer func() { defer func() {
s.logger.Printf("[DEBUG] http: Request %v (%v)", logURL, time.Now().Sub(start)) s.logger.Printf("[DEBUG] http: Request %s %v (%v)", req.Method, logURL, time.Now().Sub(start))
}() }()
obj, err := handler(resp, req) obj, err := handler(resp, req)
// Check for an error // Check for an error
HAS_ERR: HAS_ERR:
if err != nil { if err != nil {
s.logger.Printf("[ERR] http: Request %v, error: %v", logURL, err) s.logger.Printf("[ERR] http: Request %s %v, error: %v", req.Method, logURL, err)
code := 500 code := 500
errMsg := err.Error() errMsg := err.Error()
if strings.Contains(errMsg, "Permission denied") || strings.Contains(errMsg, "ACL not found") { if strings.Contains(errMsg, "Permission denied") || strings.Contains(errMsg, "ACL not found") {