Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 17:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: add error cause to connectivity view for IMAP errors

Browse Source 
For SMTP errors we already format `last_send_error` with {:#},
but for IMAP errors we have formatted the errors with .to_string().
This resulted in errors such as
"Error: IMAP failed to connect to example.org:443:tls"
instead of
"Error: IMAP failed to connect to example.org:443:tls: Connection failure: Network is unreachable (os error 101)."
in the connectivity view HTML.
This commit is contained in:
link2xt
2026-04-19 23:03:49 +02:00
committed by l
parent 31fabb24df
commit 83e31a5f17
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/imap.rs
View File

@@ -489,7 +489,7 @@ impl Imap {
let session = match self.connect(context, configuring).await { let session = match self.connect(context, configuring).await {
Ok(session) => session, Ok(session) => session,
Err(err) => { Err(err) => {
self.connectivity.set_err(context, &err); self.connectivity.set_err(context, format!("{err:#}"));
return Err(err); return Err(err);
} }
}; };

2
src/scheduler.rs
View File

@@ -631,7 +631,7 @@ async fn smtp_loop(
info!(ctx, "SMTP fake idle started."); info!(ctx, "SMTP fake idle started.");
match &connection.last_send_error { match &connection.last_send_error {
None => connection.connectivity.set_idle(&ctx), None => connection.connectivity.set_idle(&ctx),
Some(err) => connection.connectivity.set_err(&ctx, err), Some(err) => connection.connectivity.set_err(&ctx, err.clone()),
} }
// If send_smtp_messages() failed, we set a timeout for the fake-idle so that // If send_smtp_messages() failed, we set a timeout for the fake-idle so that

4
src/scheduler/connectivity.rs
View File

@@ -157,8 +157,8 @@ impl ConnectivityStore {
context.emit_event(EventType::ConnectivityChanged); context.emit_event(EventType::ConnectivityChanged);
} }
pub(crate) fn set_err(&self, context: &Context, e: impl ToString) { pub(crate) fn set_err(&self, context: &Context, e: String) {
self.set(context, DetailedConnectivity::Error(e.to_string())); self.set(context, DetailedConnectivity::Error(e));
} }
pub(crate) fn set_connecting(&self, context: &Context) { pub(crate) fn set_connecting(&self, context: &Context) {
self.set(context, DetailedConnectivity::Connecting); self.set(context, DetailedConnectivity::Connecting);