From 84203a8bb0e2940c3fc0f9f050e0676133e2e0b0 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 20 Nov 2019 12:54:59 -0500
Subject: [PATCH] Don't print webhook response in stage 3

---
 gitsrht-update-hook/post-update.go | 2 +-
 gitsrht-update-hook/stage-3.go     | 3 ++-
 gitsrht-update-hook/webhooks.go    | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gitsrht-update-hook/post-update.go b/gitsrht-update-hook/post-update.go
index 91a66d1..32e2956 100644
--- a/gitsrht-update-hook/post-update.go
+++ b/gitsrht-update-hook/post-update.go
@@ -254,7 +254,7 @@ func postUpdate() {
 		logger.Fatalf("Failed to marshal webhook payload: %v", err)
 	}
 
-	deliveries := deliverWebhooks(dbinfo.SyncWebhooks, payloadBytes)
+	deliveries := deliverWebhooks(dbinfo.SyncWebhooks, payloadBytes, true)
 	deliveriesJson, err := json.Marshal(deliveries)
 	if err != nil {
 		logger.Fatalf("Failed to marshal webhook deliveries: %v", err)
diff --git a/gitsrht-update-hook/stage-3.go b/gitsrht-update-hook/stage-3.go
index f453236..b445e37 100644
--- a/gitsrht-update-hook/stage-3.go
+++ b/gitsrht-update-hook/stage-3.go
@@ -57,7 +57,8 @@ func stage3() {
 	logger.Printf("Making %d deliveries and recording %d from stage 2",
 		len(subscriptions), len(deliveries))
 
-	deliveries = append(deliveries, deliverWebhooks(subscriptions, payload)...)
+	deliveries = append(deliveries, deliverWebhooks(
+		subscriptions, payload, false)...)
 	for _, delivery := range deliveries {
 		if _, err := db.Exec(`
 			INSERT INTO repo_webhook_delivery (
diff --git a/gitsrht-update-hook/webhooks.go b/gitsrht-update-hook/webhooks.go
index faba0de..4549e41 100644
--- a/gitsrht-update-hook/webhooks.go
+++ b/gitsrht-update-hook/webhooks.go
@@ -68,7 +68,7 @@ func initWebhookKey() {
 }
 
 func deliverWebhooks(subs []WebhookSubscription,
-	payload []byte) []WebhookDelivery {
+	payload []byte, printResponse bool) []WebhookDelivery {
 
 	var deliveries []WebhookDelivery
 	initWebhookKey()
@@ -133,7 +133,9 @@ func deliverWebhooks(subs []WebhookSubscription,
 			deliveries = append(deliveries, delivery)
 			continue
 		}
-		log.Println(runewidth.Truncate(string(respBody), 1024, "..."))
+		if printResponse {
+			log.Println(runewidth.Truncate(string(respBody), 1024, "..."))
+		}
 		logger.Printf("Delivered webhook to %s (sub %d), got %d",
 			sub.Url, sub.Id, resp.StatusCode)
 
-- 
2.38.4