Skip to content

Commit

Permalink
fix: Show root SMTP connection failure in connectivity view (#6121)
Browse files Browse the repository at this point in the history
Right now, when there is an SMTP connection error, the connectivity view
will always show "Error: SMTP connection failure: SMTP failed to
connect".

Instead, I just used the same method that is used in imap connect()
already.
  • Loading branch information
Hocuri authored Oct 29, 2024
1 parent 10aa308 commit c98d381
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/smtp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ impl Smtp {

let login_params =
prioritize_server_login_params(&context.sql, login_params, "smtp").await?;
let mut first_error = None;
for lp in login_params {
info!(context, "SMTP trying to connect to {}.", &lp.connection);
let transport = match connect::connect_and_auth(
Expand All @@ -143,6 +144,7 @@ impl Smtp {
Ok(transport) => transport,
Err(err) => {
warn!(context, "SMTP failed to connect and authenticate: {err:#}.");
first_error.get_or_insert(err);
continue;
}
};
Expand All @@ -157,7 +159,7 @@ impl Smtp {
return Ok(());
}

Err(format_err!("SMTP failed to connect"))
Err(first_error.unwrap_or_else(|| format_err!("No SMTP connection candidates provided")))
}
}

Expand Down

0 comments on commit c98d381

Please sign in to comment.