From b7e391889df9d3ac082df1ff5a2fac290b6bf9f7 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Tue, 13 Oct 2020 13:42:15 -0400 Subject: [PATCH] Make worker logs less loud --- email/worker.go | 4 ++-- webhooks/legacy.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/email/worker.go b/email/worker.go index 8862227f27ce68e10c9892c3a3962a20c367fac6..6f14ca6b6f2a96a87b6752eb04ef58275a583744 100644 --- a/email/worker.go +++ b/email/worker.go @@ -25,12 +25,12 @@ func NewTask(m *gomail.Message) *work.Task { return Send(ctx, m) }).Retries(10).After(func(ctx context.Context, task *work.Task) { if task.Result() == nil { - log.Printf("MAIL TO %s: '%s' sent after %d attempts", + log.Printf("Mail to %s: '%s' sent after %d attempts", strings.Join(m.GetHeader("To"), ";"), strings.Join(m.GetHeader("Subject"), ";"), task.Attempts()) } else { - log.Printf("MAIL TO %s: '%s' failed after %d attempts: %v", + log.Printf("Mail to %s: '%s' failed after %d attempts: %v", strings.Join(m.GetHeader("To"), ";"), strings.Join(m.GetHeader("Subject"), ";"), task.Attempts(), task.Result()) diff --git a/webhooks/legacy.go b/webhooks/legacy.go index 7ea3d8dc06e4cff509e4d782f2ffee80690570c0..6731bddc08bf22ff4e29dd57c9cb24a6d0a21743 100644 --- a/webhooks/legacy.go +++ b/webhooks/legacy.go @@ -184,10 +184,10 @@ func (lq *LegacyQueue) queueStage2(ctx context.Context, tx *sql.Tx, return deliverPayload(ctx, name, sub.URL, headers, payload, deliveryID) }).Retries(5).After(func(ctx context.Context, task *work.Task) { if task.Result() == nil { - log.Printf("LEGACY WEBHOOK: %s: delivery complete after %d attempts", + log.Printf("%s: delivery complete after %d attempts", deliveryUUID, task.Attempts()) } else { - log.Printf("LEGACY WEBHOOK: %s: delivery failed after %d attempts: %v", + log.Printf("%s: delivery failed after %d attempts: %v", deliveryUUID, task.Attempts(), task.Result()) } }), nil