Add expiry information to SMTP logs

This commit is contained in:
mdecimus
2025-06-25 07:39:10 +02:00
parent 9ca374151c
commit 9b2f687561

View File

@@ -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 {