From 9977fa8c615303b031c2140aa60e7fc6c2de869c Mon Sep 17 00:00:00 2001 From: Adnan Hajdarevic Date: Sat, 6 Jun 2015 14:28:00 +0200 Subject: [PATCH] refactor --- webhook.go | 8 ++++---- webhook_windows.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/webhook.go b/webhook.go index 207a25a..fc45fa1 100644 --- a/webhook.go +++ b/webhook.go @@ -189,12 +189,12 @@ func hookHandler(w http.ResponseWriter, r *http.Request) { if h.TriggerRule == nil || h.TriggerRule != nil && h.TriggerRule.Evaluate(&headers, &query, &payload, &body) { log.Printf("%s hook triggered successfully\n", h.ID) - if !h.CaptureCommandOutput { - go handleHook(h, &headers, &query, &payload, &body) - fmt.Fprintf(w, h.ResponseMessage) - } else { + if h.CaptureCommandOutput { response := handleHook(h, &headers, &query, &payload, &body) fmt.Fprintf(w, response) + } else { + go handleHook(h, &headers, &query, &payload, &body) + fmt.Fprintf(w, h.ResponseMessage) } return diff --git a/webhook_windows.go b/webhook_windows.go index 7dc684a..08700e9 100644 --- a/webhook_windows.go +++ b/webhook_windows.go @@ -179,12 +179,12 @@ func hookHandler(w http.ResponseWriter, r *http.Request) { if h.TriggerRule == nil || h.TriggerRule != nil && h.TriggerRule.Evaluate(&headers, &query, &payload, &body) { log.Printf("%s hook triggered successfully\n", h.ID) - if !h.CaptureCommandOutput { - go handleHook(h, &headers, &query, &payload, &body) - fmt.Fprintf(w, h.ResponseMessage) - } else { + if h.CaptureCommandOutput { response := handleHook(h, &headers, &query, &payload, &body) fmt.Fprintf(w, response) + } else { + go handleHook(h, &headers, &query, &payload, &body) + fmt.Fprintf(w, h.ResponseMessage) } return