Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-09-22 04:58:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: emit SmtpMessageSent event after deleting the message from SMTP queue

Browse Source 
This is mostly needed to fix flaky
tests/test_something.py::test_is_sending_finished
by making sure that is_sending_finished() return false
once we got an event that message was sent.
This commit is contained in:
link2xt
2026-09-16 20:22:20 +00:00
committed by l
parent 349c9650e3
commit 78caa6f53c
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/smtp.rs
View File

@@ -467,16 +467,16 @@ pub(crate) async fn send_msg_to_smtp(
let split_index = usize::try_from(chunk_size.min(unsent_len)) let split_index = usize::try_from(chunk_size.min(unsent_len))
.context("Failed to convert SMTP chunk size")?; .context("Failed to convert SMTP chunk size")?;
let (chunk, rest) = unsent.split_at(split_index); let (chunk, rest) = unsent.split_at(split_index);
let status = smtp_send(context, chunk, body.as_str(), smtp, Some(msg_id)).await;
if !matches!(status, SendResult::Success) || rest.is_empty() {
break status;
}
for sent_to_addr in chunk { for sent_to_addr in chunk {
let sent_to_addr_string = sent_to_addr.to_string(); let sent_to_addr_string = sent_to_addr.to_string();
if !sent_to_set.insert(sent_to_addr_string) { if !sent_to_set.insert(sent_to_addr_string) {
error!(context, "Attempted to send to {sent_to_addr} twice."); error!(context, "Attempted to send to {sent_to_addr} twice.");
} }
} }
let status = smtp_send(context, chunk, body.as_str(), smtp, Some(msg_id)).await;
if !matches!(status, SendResult::Success) || rest.is_empty() {
break status;
}
let sent_to_str = sent_to_set let sent_to_str = sent_to_set
.iter() .iter()
.map(|a| a.as_ref()) .map(|a| a.as_ref())
@@ -499,6 +499,15 @@ pub(crate) async fn send_msg_to_smtp(
.sql .sql
.execute("DELETE FROM smtp2 WHERE id=?", (rowid,)) .execute("DELETE FROM smtp2 WHERE id=?", (rowid,))
.await?; .await?;
let sent_to_len = sent_to_set.len();
debug_assert!(sent_to_len > 0);
let info_msg = format!(
"Message len={} was SMTP-sent to {sent_to_len} recipients.",
body.len()
);
info!(context, "{info_msg}.");
context.emit_event(EventType::SmtpMessageSent(info_msg));
} }
SendResult::Failure(ref err) => { SendResult::Failure(ref err) => {
if err if err

9
src/smtp/send.rs
View File

@@ -5,7 +5,6 @@ use async_smtp::{EmailAddress, Envelope, SendableEmail};
use super::Smtp; use super::Smtp;
use crate::config::Config; use crate::config::Config;
use crate::context::Context; use crate::context::Context;
use crate::events::EventType;
use crate::log::warn; use crate::log::warn;
use crate::tools; use crate::tools;
@@ -39,8 +38,6 @@ impl Smtp {
context.ratelimit.write().await.send(); context.ratelimit.write().await.send();
} }
let message_len_bytes = message.len();
let envelope = let envelope =
Envelope::new(self.from.clone(), recipients.to_vec()).map_err(Error::Envelope)?; Envelope::new(self.from.clone(), recipients.to_vec()).map_err(Error::Envelope)?;
let mail = SendableEmail::new(envelope, message); let mail = SendableEmail::new(envelope, message);
@@ -55,12 +52,6 @@ impl Smtp {
transport.send(mail).await.map_err(Error::SmtpSend)?; transport.send(mail).await.map_err(Error::SmtpSend)?;
let info_msg = format!(
"Message len={message_len_bytes} was SMTP-sent to {} recipients.",
recipients.len()
);
info!(context, "{info_msg}.");
context.emit_event(EventType::SmtpMessageSent(info_msg));
self.last_success = Some(tools::Time::now()); self.last_success = Some(tools::Time::now());
Ok(()) Ok(())
} }