CalDAV Scheduling - part 6

crates/services/src/task_manager/alarm.rs

@@ -27,7 +27,7 @@ use mail_builder::{
 use mail_parser::decoders::html::html_to_text;
 use smtp::core::{Session, SessionData};
 use smtp_proto::{MailFrom, RcptTo};
-use std::{str::FromStr, sync::Arc};
+use std::{str::FromStr, sync::Arc, time::Duration};
 use store::write::{BatchBuilder, now};
 use trc::{AddContext, TaskQueueEvent};
 use utils::{sanitize_email, template::Variables};
@@ -423,6 +423,7 @@ async fn send_alarm(
         }
 
         // RCPT TO
+        session.params.rcpt_errors_wait = Duration::from_secs(0);
         let _ = session
             .handle_rcpt_to(RcptTo {
                 address: rcpt_to,

crates/services/src/task_manager/imip.rs

@@ -18,7 +18,7 @@ use mail_builder::{
 };
 use smtp::core::{Session, SessionData};
 use smtp_proto::{MailFrom, RcptTo};
-use std::sync::Arc;
+use std::{sync::Arc, time::Duration};
 use store::{
     ValueKey,
     write::{AlignedBytes, Archive, TaskQueueClass, ValueClass, now},
@@ -219,6 +219,7 @@ async fn send_imip(
                 }
 
                 // RCPT TO
+                session.params.rcpt_errors_wait = Duration::from_secs(0);
                 let _ = session
                     .handle_rcpt_to(RcptTo {
                         address: to.clone(),

crates/services/src/task_manager/mod.rs

@@ -331,10 +331,7 @@ impl TaskQueueManager for Server {
 impl Task {
     fn remove_lock(&self) -> bool {
         // Bayes locks are not removed to avoid constant retraining
-        matches!(
-            self.action,
-            TaskAction::Index { .. } | TaskAction::SendAlarm { .. }
-        )
+        !matches!(self.action, TaskAction::BayesTrain { .. })
     }
 
     fn lock_key(&self) -> Vec<u8> {