GeneralBots/botserver
2
1
Fork 0
Code Activity Actions

fix: catch panics in send_mail thread
Some checks failed
BotServer CI/CD / build (push) Failing after 1m16s
Details

Browse source
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2026-04-05 00:22:26 -03:00
parent eba075bb9d
commit b277b032b0
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/basic/keywords/send_mail.rs
View file

@ -287,17 +287,27 @@ pub fn send_mail_keyword(state: Arc<AppState>, user: UserSession, engine: &mut E
let user_for_task = user_fn.clone();
std::thread::spawn(move || {
let rt = tokio::runtime::Builder::new_multi_thread()
.worker_threads(2)
.enable_all()
.build();
let result = std::panic::catch_unwind(|| {
let rt = tokio::runtime::Builder::new_multi_thread()
.worker_threads(2)
.enable_all()
.build();
let result = if let Ok(rt) = rt {
rt.block_on(async move {
execute_send_mail(&state_for_task, &user_for_task, &to_str, &subject_str, &body_str, atts, None).await
})
} else {
Err("Failed to build tokio runtime".to_string())
if let Ok(rt) = rt {
rt.block_on(async move {
execute_send_mail(&state_for_task, &user_for_task, &to_str, &subject_str, &body_str, atts, None).await
})
} else {
Err("Failed to build tokio runtime".to_string())
}
});
let result = match result {
Ok(r) => r,
Err(e) => {
log::error!("send_mail thread panicked: {:?}", e);
Err(format!("send_mail thread panicked: {:?}", e))
}
};
let _ = tx.send(result);