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 @@ return work.NewTask(func(ctx context.Context) error { 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 @@ return work.NewTask(func(ctx context.Context) error { 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