make imap clients pool more reliable

pimalaya · Sep 28, 2024 · 3a4bcd6 · 3a4bcd6
1 parent 649d3c5
commit 3a4bcd6
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 91 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,7 +39,7 @@ clap = { version = "4.4", features = ["derive", "wrap_help"] }
 clap_complete = "4.4"
 clap_mangen = "0.2"
 color-eyre = "0.6"
-email-lib = { version = "=0.25.0", default-features = false, features = ["pool", "sync", "derive"] }
+email-lib = { version = "=0.25.0", default-features = false, features = ["sync", "derive"] }
 oauth-lib = { version = "=0.1.1", optional = true }
 once_cell = "1.16"
 pimalaya-tui = { version = "=0.1.0", default-features = false, features = ["path", "cli", "config", "tracing"] }

diff --git a/src/account/command/doctor.rs b/src/account/command/doctor.rs
@@ -7,13 +7,13 @@ use std::sync::Arc;
 
 use clap::Parser;
 use color_eyre::eyre::{bail, Result};
-use email::backend::{Backend, BackendBuilder};
+use email::backend::BackendBuilder;
 #[cfg(feature = "imap")]
-use email::imap::{ImapContextBuilder, ImapContextSync};
+use email::imap::ImapContextBuilder;
 #[cfg(feature = "maildir")]
-use email::maildir::{MaildirContextBuilder, MaildirContextSync};
+use email::maildir::MaildirContextBuilder;
 #[cfg(feature = "notmuch")]
-use email::notmuch::{NotmuchContextBuilder, NotmuchContextSync};
+use email::notmuch::NotmuchContextBuilder;
 use pimalaya_tui::cli::printer::Printer;
 use tracing::{info, instrument};
 
@@ -56,25 +56,26 @@ impl DoctorAccountCommand {
             #[cfg(feature = "imap")]
             BackendConfig::Imap(imap_config) => {
                 printer.log("Checking left IMAP integrity…")?;
-                let ctx = ImapContextBuilder::new(left_config.clone(), Arc::new(imap_config));
+                let ctx = ImapContextBuilder::new(left_config.clone(), Arc::new(imap_config))
+                    .with_pool_size(1);
                 BackendBuilder::new(left_config.clone(), ctx)
-                    .check_up::<Backend<ImapContextSync>>()
+                    .check_up()
                     .await?;
             }
             #[cfg(feature = "maildir")]
             BackendConfig::Maildir(maildir_config) => {
                 printer.log("Checking left Maildir integrity…")?;
                 let ctx = MaildirContextBuilder::new(left_config.clone(), Arc::new(maildir_config));
                 BackendBuilder::new(left_config.clone(), ctx)
-                    .check_up::<Backend<MaildirContextSync>>()
+                    .check_up()
                     .await?;
             }
             #[cfg(feature = "notmuch")]
             BackendConfig::Notmuch(notmuch_config) => {
                 printer.log("Checking left Notmuch integrity…")?;
                 let ctx = NotmuchContextBuilder::new(left_config.clone(), Arc::new(notmuch_config));
                 BackendBuilder::new(left_config.clone(), ctx)
-                    .check_up::<Backend<NotmuchContextSync>>()
+                    .check_up()
                     .await?;
             }
         };
@@ -93,7 +94,7 @@ impl DoctorAccountCommand {
                 printer.log("Checking right IMAP integrity…")?;
                 let ctx = ImapContextBuilder::new(right_config.clone(), Arc::new(imap_config));
                 BackendBuilder::new(right_config.clone(), ctx)
-                    .check_up::<Backend<ImapContextSync>>()
+                    .check_up()
                     .await?;
             }
             #[cfg(feature = "maildir")]
@@ -102,7 +103,7 @@ impl DoctorAccountCommand {
                 let ctx =
                     MaildirContextBuilder::new(right_config.clone(), Arc::new(maildir_config));
                 BackendBuilder::new(right_config.clone(), ctx)
-                    .check_up::<Backend<MaildirContextSync>>()
+                    .check_up()
                     .await?;
             }
             #[cfg(feature = "notmuch")]
@@ -111,7 +112,7 @@ impl DoctorAccountCommand {
                 let ctx =
                     NotmuchContextBuilder::new(right_config.clone(), Arc::new(notmuch_config));
                 BackendBuilder::new(right_config.clone(), ctx)
-                    .check_up::<Backend<NotmuchContextSync>>()
+                    .check_up()
                     .await?;
             }
         };