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: prefer login errors over connection errors

Browse Source
This commit is contained in:
Hocuri
2026-09-21 17:44:37 +02:00
parent c41657d7fd
commit 83204fada1
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/imap.rs
View File

@@ -299,7 +299,8 @@ impl Imap {
self.conn_backoff_ms = max(BACKOFF_MIN_MS, self.conn_backoff_ms); self.conn_backoff_ms = max(BACKOFF_MIN_MS, self.conn_backoff_ms);
let login_params = prioritize_server_login_params(&context.sql, &self.lp, "imap").await?; let login_params = prioritize_server_login_params(&context.sql, &self.lp, "imap").await?;
let mut first_error = None; let mut first_connection_error = None;
let mut first_login_error = None;
'candidate: for lp in login_params { 'candidate: for lp in login_params {
info!(context, "IMAP trying to connect to {}.", lp.connection); info!(context, "IMAP trying to connect to {}.", lp.connection);
let connection_candidate = lp.connection.clone(); let connection_candidate = lp.connection.clone();
@@ -315,7 +316,7 @@ impl Imap {
Ok(client) => client, Ok(client) => client,
Err(err) => { Err(err) => {
warn!(context, "{err:#}."); warn!(context, "{err:#}.");
first_error.get_or_insert(err); first_connection_error.get_or_insert(err);
continue 'candidate; continue 'candidate;
} }
}; };
@@ -394,12 +395,14 @@ impl Imap {
Err(err) => { Err(err) => {
warn!(context, "{err:#}."); warn!(context, "{err:#}.");
first_error.get_or_insert(err); first_login_error.get_or_insert(err);
} }
} }
} }
Err(first_error.unwrap_or_else(|| format_err!("No IMAP connection candidates provided"))) Err(first_login_error
.or(first_connection_error)
.unwrap_or_else(|| format_err!("No IMAP connection candidates provided")))
} }
/// Prepare a new IMAP session. /// Prepare a new IMAP session.