Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-20 23:16:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix ordering error

Browse Source
This commit is contained in:
holger krekel
2020-02-19 17:04:42 +01:00
parent 0b0ed56901
commit d5d662bc41
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/job.rs
View File

@@ -193,14 +193,24 @@ impl Job {
Err(crate::smtp::send::Error::SendError(err)) => { Err(crate::smtp::send::Error::SendError(err)) => {
// Remote error, retry later. // Remote error, retry later.
warn!(context, "SMTP failed to send: {}", err); warn!(context, "SMTP failed to send: {}", err);
smtp.disconnect();
self.pending_error = Some(err.to_string()); self.pending_error = Some(err.to_string());
// if the connection was successfully used more than 60
// seconds ago, try an immediate reconnect.
let mut res = Status::RetryLater;
if let Some(secs) = smtp.secs_since_last_success() { if let Some(secs) = smtp.secs_since_last_success() {
if secs > 60 { if secs > 60 {
return Status::RetryNow; info!(
context,
"SMTP connection was stale, triggering immediate reconnect"
);
res = Status::RetryNow;
} }
} }
Status::RetryLater // this clears last_success info
smtp.disconnect();
res
} }
Err(crate::smtp::send::Error::EnvelopeError(err)) => { Err(crate::smtp::send::Error::EnvelopeError(err)) => {
// Local error, job is invalid, do not retry. // Local error, job is invalid, do not retry.