infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-06-28 01:48:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

queue: in log lines about delivery, we had both "attempts" starting at 0 and "attempt" starting at 1, keep only "attempts" starting at 1

Browse Source 
from eric l, thanks!
This commit is contained in:
Mechiel Lukkien 2025-04-07 13:33:31 +02:00
parent 39c21f80cd
commit 902de0e1f9
No known key found for this signature in database
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
queue/direct.go
View File

@ -426,7 +426,6 @@ func deliverHost(log mlog.Log, resolver dns.Resolver, dialer smtpclient.Dialer,
log.Debugx("queue deliverhost result", result.err, log.Debugx("queue deliverhost result", result.err,
slog.Any("host", host), slog.Any("host", host),
slog.Int("attempt", m0.Attempts),
slog.String("result", r), slog.String("result", r),
slog.Int("delivered", len(result.delivered)), slog.Int("delivered", len(result.delivered)),
slog.Int("failed", len(result.failed)), slog.Int("failed", len(result.failed)),

2
queue/queue.go
View File

@ -1338,7 +1338,7 @@ func deliver(log mlog.Log, resolver dns.Resolver, m0 Msg) {
qlog := log.WithCid(mox.Cid()).With( qlog := log.WithCid(mox.Cid()).With(
slog.Any("from", m0.Sender()), slog.Any("from", m0.Sender()),
slog.Int("attempts", m0.Attempts)) slog.Int("attempts", m0.Attempts+1))
defer func() { defer func() {
deliveryResults <- formatIPDomain(m0.RecipientDomain) deliveryResults <- formatIPDomain(m0.RecipientDomain)

1
queue/submit.go
View File

@ -68,7 +68,6 @@ func deliverSubmit(qlog mlog.Log, resolver dns.Resolver, dialer smtpclient.Diale
qlog.Debugx("queue deliversubmit result", submiterr, qlog.Debugx("queue deliversubmit result", submiterr,
slog.Any("host", transport.DNSHost), slog.Any("host", transport.DNSHost),
slog.Int("port", port), slog.Int("port", port),
slog.Int("attempt", m0.Attempts),
slog.String("result", r), slog.String("result", r),
slog.Int("delivered", delivered), slog.Int("delivered", delivered),
slog.Int("failed", failed), slog.Int("failed", failed),