From 9b2f687561c0ea5f52acf5b3d56a4fb55954f057 Mon Sep 17 00:00:00 2001 From: mdecimus Date: Wed, 25 Jun 2025 07:39:10 +0200 Subject: [PATCH] Add expiry information to SMTP logs --- crates/smtp/src/outbound/delivery.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/crates/smtp/src/outbound/delivery.rs b/crates/smtp/src/outbound/delivery.rs index f1c7cf29..8159beb6 100644 --- a/crates/smtp/src/outbound/delivery.rs +++ b/crates/smtp/src/outbound/delivery.rs @@ -1363,6 +1363,10 @@ impl Message { SpanId = self.span_id, Domain = domain.domain.clone(), Reason = from_error_status(&domain.status), + Details = trc::Value::Timestamp(now), + Expires = trc::Value::Timestamp(domain.expires), + NextRetry = trc::Value::Timestamp(domain.retry.due), + NextDsn = trc::Value::Timestamp(domain.notify.due), ); for rcpt in &mut self.recipients { @@ -1381,6 +1385,10 @@ impl Message { SpanId = self.span_id, Domain = domain.domain.clone(), Reason = "Message expired without any delivery attempts made.", + Details = trc::Value::Timestamp(now), + Expires = trc::Value::Timestamp(domain.expires), + NextRetry = trc::Value::Timestamp(domain.retry.due), + NextDsn = trc::Value::Timestamp(domain.notify.due), ); for rcpt in &mut self.recipients {