From 902de0e1f957572bb3e419d0fb31d23394339619 Mon Sep 17 00:00:00 2001 From: Mechiel Lukkien Date: Mon, 7 Apr 2025 13:33:31 +0200 Subject: [PATCH] queue: in log lines about delivery, we had both "attempts" starting at 0 and "attempt" starting at 1, keep only "attempts" starting at 1 from eric l, thanks! --- queue/direct.go | 1 - queue/queue.go | 2 +- queue/submit.go | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/queue/direct.go b/queue/direct.go index 082d1bf..bcb2d44 100644 --- a/queue/direct.go +++ b/queue/direct.go @@ -426,7 +426,6 @@ func deliverHost(log mlog.Log, resolver dns.Resolver, dialer smtpclient.Dialer, log.Debugx("queue deliverhost result", result.err, slog.Any("host", host), - slog.Int("attempt", m0.Attempts), slog.String("result", r), slog.Int("delivered", len(result.delivered)), slog.Int("failed", len(result.failed)), diff --git a/queue/queue.go b/queue/queue.go index 4289691..5cf22a7 100644 --- a/queue/queue.go +++ b/queue/queue.go @@ -1338,7 +1338,7 @@ func deliver(log mlog.Log, resolver dns.Resolver, m0 Msg) { qlog := log.WithCid(mox.Cid()).With( slog.Any("from", m0.Sender()), - slog.Int("attempts", m0.Attempts)) + slog.Int("attempts", m0.Attempts+1)) defer func() { deliveryResults <- formatIPDomain(m0.RecipientDomain) diff --git a/queue/submit.go b/queue/submit.go index f6bdbbe..f258968 100644 --- a/queue/submit.go +++ b/queue/submit.go @@ -68,7 +68,6 @@ func deliverSubmit(qlog mlog.Log, resolver dns.Resolver, dialer smtpclient.Diale qlog.Debugx("queue deliversubmit result", submiterr, slog.Any("host", transport.DNSHost), slog.Int("port", port), - slog.Int("attempt", m0.Attempts), slog.String("result", r), slog.Int("delivered", delivered), slog.Int("failed", failed),