Skip to content

Commit

Permalink
Merge pull request adnanh#173 from ivanpesin/log-request-id
Browse files Browse the repository at this point in the history 
Add request-id to verbose log messages
  • Loading branch information
@adnanh
adnanh authored Sep 14, 2017
2 parents 985d519 + da39872 commit 71269d8
Showing 1 changed file with 24 additions and 19 deletions.
43 changes: 24 additions & 19 deletions webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (

"github.com/codegangsta/negroni"
"github.com/gorilla/mux"
"github.com/satori/go.uuid"

fsnotify "gopkg.in/fsnotify.v1"
)
Expand Down Expand Up @@ -198,7 +199,11 @@ func main() {
}

func hookHandler(w http.ResponseWriter, r *http.Request) {
log.Printf("incoming HTTP request from %s\n", r.RemoteAddr)

// generate a request id for logging
rid := uuid.NewV4().String()[:6]

log.Printf("[%s] incoming HTTP request from %s\n", rid, r.RemoteAddr)

for _, responseHeader := range responseHeaders {
w.Header().Set(responseHeader.Name, responseHeader.Value)
Expand All @@ -207,11 +212,11 @@ func hookHandler(w http.ResponseWriter, r *http.Request) {
id := mux.Vars(r)["id"]

if matchedHook := matchLoadedHook(id); matchedHook != nil {
log.Printf("%s got matched\n", id)
log.Printf("[%s] %s got matched\n", rid, id)

body, err := ioutil.ReadAll(r.Body)
if err != nil {
log.Printf("error reading the request body. %+v\n", err)
log.Printf("[%s] error reading the request body. %+v\n", rid, err)
}

// parse headers
Expand All @@ -232,12 +237,12 @@ func hookHandler(w http.ResponseWriter, r *http.Request) {
err := decoder.Decode(&payload)

if err != nil {
log.Printf("error parsing JSON payload %+v\n", err)
log.Printf("[%s] error parsing JSON payload %+v\n", rid, err)
}
} else if strings.Contains(contentType, "form") {
fd, err := url.ParseQuery(string(body))
if err != nil {
log.Printf("error parsing form payload %+v\n", err)
log.Printf("[%s] error parsing form payload %+v\n", rid, err)
} else {
payload = valuesToMap(fd)
}
Expand All @@ -246,7 +251,7 @@ func hookHandler(w http.ResponseWriter, r *http.Request) {
// handle hook
if errors := matchedHook.ParseJSONParameters(&headers, &query, &payload); errors != nil {
for _, err := range errors {
log.Printf("error parsing JSON parameters: %s\n", err)
log.Printf("[%s] error parsing JSON parameters: %s\n", rid, err)
}
}

Expand All @@ -257,7 +262,7 @@ func hookHandler(w http.ResponseWriter, r *http.Request) {
} else {
ok, err = matchedHook.TriggerRule.Evaluate(&headers, &query, &payload, &body, r.RemoteAddr)
if err != nil {
msg := fmt.Sprintf("error evaluating hook: %s", err)
msg := fmt.Sprintf("[%s] error evaluating hook: %s", rid, err)
log.Printf(msg)
w.WriteHeader(http.StatusInternalServerError)
fmt.Fprintf(w, "Error occurred while evaluating hook rules.")
Expand All @@ -266,14 +271,14 @@ func hookHandler(w http.ResponseWriter, r *http.Request) {
}

if ok {
log.Printf("%s hook triggered successfully\n", matchedHook.ID)
log.Printf("[%s] %s hook triggered successfully\n", rid, matchedHook.ID)

for _, responseHeader := range matchedHook.ResponseHeaders {
w.Header().Set(responseHeader.Name, responseHeader.Value)
}

if matchedHook.CaptureCommandOutput {
response, err := handleHook(matchedHook, &headers, &query, &payload, &body)
response, err := handleHook(matchedHook, rid, &headers, &query, &payload, &body)

if err != nil {
w.Header().Set("Content-Type", "text/plain; charset=utf-8")
Expand All @@ -283,7 +288,7 @@ func hookHandler(w http.ResponseWriter, r *http.Request) {
fmt.Fprintf(w, response)
}
} else {
go handleHook(matchedHook, &headers, &query, &payload, &body)
go handleHook(matchedHook, rid, &headers, &query, &payload, &body)
fmt.Fprintf(w, matchedHook.ResponseMessage)
}
return
Expand All @@ -296,12 +301,12 @@ func hookHandler(w http.ResponseWriter, r *http.Request) {
if len(http.StatusText(matchedHook.TriggerRuleMismatchHttpResponseCode)) > 0 {
w.WriteHeader(matchedHook.TriggerRuleMismatchHttpResponseCode)
} else {
log.Printf("%s got matched, but the configured return code %d is unknown - defaulting to 200\n", matchedHook.ID, matchedHook.TriggerRuleMismatchHttpResponseCode)
log.Printf("[%s] %s got matched, but the configured return code %d is unknown - defaulting to 200\n", rid, matchedHook.ID, matchedHook.TriggerRuleMismatchHttpResponseCode)
}
}

// if none of the hooks got triggered
log.Printf("%s got matched, but didn't get triggered because the trigger rules were not satisfied\n", matchedHook.ID)
log.Printf("[%s] %s got matched, but didn't get triggered because the trigger rules were not satisfied\n", rid, matchedHook.ID)

fmt.Fprintf(w, "Hook rules were not satisfied.")
} else {
Expand All @@ -310,7 +315,7 @@ func hookHandler(w http.ResponseWriter, r *http.Request) {
}
}

func handleHook(h *hook.Hook, headers, query, payload *map[string]interface{}, body *[]byte) (string, error) {
func handleHook(h *hook.Hook, rid string, headers, query, payload *map[string]interface{}, body *[]byte) (string, error) {
var errors []error

cmd := exec.Command(h.ExecuteCommand)
Expand All @@ -319,7 +324,7 @@ func handleHook(h *hook.Hook, headers, query, payload *map[string]interface{}, b
cmd.Args, errors = h.ExtractCommandArguments(headers, query, payload)
if errors != nil {
for _, err := range errors {
log.Printf("error extracting command arguments: %s\n", err)
log.Printf("[%s] error extracting command arguments: %s\n", rid, err)
}
}

Expand All @@ -328,23 +333,23 @@ func handleHook(h *hook.Hook, headers, query, payload *map[string]interface{}, b

if errors != nil {
for _, err := range errors {
log.Printf("error extracting command arguments for environment: %s\n", err)
log.Printf("[%s] error extracting command arguments for environment: %s\n", rid, err)
}
}

cmd.Env = append(os.Environ(), envs...)

log.Printf("executing %s (%s) with arguments %q and environment %s using %s as cwd\n", h.ExecuteCommand, cmd.Path, cmd.Args, envs, cmd.Dir)
log.Printf("[%s] executing %s (%s) with arguments %q and environment %s using %s as cwd\n", rid, h.ExecuteCommand, cmd.Path, cmd.Args, envs, cmd.Dir)

out, err := cmd.CombinedOutput()

log.Printf("command output: %s\n", out)
log.Printf("[%s] command output: %s\n", rid, out)

if err != nil {
log.Printf("error occurred: %+v\n", err)
log.Printf("[%s] error occurred: %+v\n", rid, err)
}

log.Printf("finished handling %s\n", h.ID)
log.Printf("[%s] finished handling %s\n", rid, h.ID)

return string(out), err
}
Expand Down

0 comments on commit 71269d8

Please sign in to comment.