~edwargix/git.sr.ht

84203a8bb0e2940c3fc0f9f050e0676133e2e0b0 — Drew DeVault 6 years ago 1d86135
Don't print webhook response in stage 3
M gitsrht-update-hook/post-update.go => gitsrht-update-hook/post-update.go +1 -1
@@ 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)

M gitsrht-update-hook/stage-3.go => gitsrht-update-hook/stage-3.go +2 -1
@@ 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 (

M gitsrht-update-hook/webhooks.go => gitsrht-update-hook/webhooks.go +4 -2
@@ 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)