meli
/
meli
8
Fork 13
Code Issues 10 Pull Requests 10 Actions Packages Projects 1 Releases 18 Wiki Activity

conf/accounts.rs: don't retry connect on auth error

memfd
Manos Pitsidianakis 2020-08-02 00:46:37 +03:00
parent 1bdecd62c7
commit c5d0a6c3b6
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 62 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/conf/accounts.rs
View File

@ -1627,6 +1627,16 @@ impl Account {
for j in drain { for j in drain {
self.active_job_instants.remove(&j); self.active_job_instants.remove(&j);
} }
if self.is_online.is_err()
&& self
.is_online
.as_ref()
.unwrap_err()
.kind
.is_authentication()
{
return self.is_online.clone();
}
if self.backend_capabilities.is_async { if self.backend_capabilities.is_async {
if self.is_online.is_ok() && !timeout { if self.is_online.is_ok() && !timeout {
return Ok(()); return Ok(());
@ -1708,7 +1718,19 @@ impl Account {
match self.active_jobs.remove(job_id).unwrap() { match self.active_jobs.remove(job_id).unwrap() {
JobRequest::Mailboxes(_, ref mut chan) => { JobRequest::Mailboxes(_, ref mut chan) => {
if let Some(mailboxes) = chan.try_recv().unwrap() { if let Some(mailboxes) = chan.try_recv().unwrap() {
if mailboxes.is_err() || self.init(Some(mailboxes.unwrap())).is_err() { if let Err(err) = mailboxes.and_then(|mailboxes| self.init(Some(mailboxes)))
{
if err.kind.is_authentication() {
self.sender
.send(ThreadEvent::UIEvent(UIEvent::Notification(
Some(format!("{}: authentication error", &self.name)),
err.to_string(),
Some(crate::types::NotificationType::ERROR),
)))
.expect("Could not send event on main channel");
self.is_online = Err(err);
return true;
}
if let Ok(mailboxes_job) = if let Ok(mailboxes_job) =
self.backend.read().unwrap().mailboxes_async() self.backend.read().unwrap().mailboxes_async()
{ {
@ -1761,6 +1783,13 @@ impl Account {
.insert(std::time::Instant::now(), job_id); .insert(std::time::Instant::now(), job_id);
let payload = payload.unwrap(); let payload = payload.unwrap();
if let Err(err) = payload { if let Err(err) = payload {
self.sender
.send(ThreadEvent::UIEvent(UIEvent::Notification(
Some(format!("{}: could not fetch mailbox", &self.name)),
err.to_string(),
Some(crate::types::NotificationType::ERROR),
)))
.expect("Could not send event on main channel");
self.mailbox_entries self.mailbox_entries
.entry(mailbox_hash) .entry(mailbox_hash)
.and_modify(|entry| { .and_modify(|entry| {
@ -1807,7 +1836,14 @@ impl Account {
))) )))
.unwrap(); .unwrap();
if is_online.is_ok() { if is_online.is_ok() {
if self.is_online.is_err() { if self.is_online.is_err()
&& !self
.is_online
.as_ref()
.unwrap_err()
.kind
.is_authentication()
{
self.watch(); self.watch();
} }
self.last_online_request = std::time::Instant::now(); self.last_online_request = std::time::Instant::now();
@ -1829,17 +1865,33 @@ impl Account {
let r = chan.try_recv().unwrap(); let r = chan.try_recv().unwrap();
if let Some(r) = r { if let Some(r) = r {
if r.is_ok() { if r.is_ok() {
if self.is_online.is_err() { if self.is_online.is_err()
&& !self
.is_online
.as_ref()
.unwrap_err()
.kind
.is_authentication()
{
self.watch(); self.watch();
} }
} }
self.last_online_request = std::time::Instant::now(); if !(self.is_online.is_err()
self.is_online = Ok(()); && self
self.sender .is_online
.send(ThreadEvent::UIEvent(UIEvent::AccountStatusChange( .as_ref()
self.index, .unwrap_err()
))) .kind
.unwrap(); .is_authentication())
{
self.last_online_request = std::time::Instant::now();
self.is_online = Ok(());
self.sender
.send(ThreadEvent::UIEvent(UIEvent::AccountStatusChange(
self.index,
)))
.unwrap();
}
} }
self.sender self.sender
.send(ThreadEvent::UIEvent(UIEvent::StatusEvent( .send(ThreadEvent::UIEvent(UIEvent::StatusEvent(