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

Improve logs for prefetch checks

Browse Source
This commit is contained in:
Alexander Krotov
2020-02-09 18:17:29 +03:00
parent 5277013537
commit 655a53aea4
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/imap/mod.rs
View File

@@ -633,20 +633,7 @@ impl Imap {
let headers = get_fetch_headers(fetch)?; let headers = get_fetch_headers(fetch)?;
let message_id = prefetch_get_message_id(&headers).unwrap_or_default(); let message_id = prefetch_get_message_id(&headers).unwrap_or_default();
let show = prefetch_should_download(context, &headers, show_emails).unwrap_or(true); if precheck_imf(context, &message_id, folder.as_ref(), cur_uid) {
if show && !precheck_imf(context, &message_id, folder.as_ref(), cur_uid) {
// check passed, go fetch the rest
if self.fetch_single_msg(context, &folder, cur_uid).await == 0 {
info!(
context,
"Read error for message {} from \"{}\", trying over later.",
message_id,
folder.as_ref()
);
read_errors += 1;
}
} else {
// we know the message-id already or don't want the message otherwise. // we know the message-id already or don't want the message otherwise.
info!( info!(
context, context,
@@ -654,6 +641,33 @@ impl Imap {
message_id, message_id,
folder.as_ref(), folder.as_ref(),
); );
} else {
let show = prefetch_should_download(context, &headers, show_emails)
.map_err(|err| {
warn!(context, "prefetch_should_download error: {}", err);
err
})
.unwrap_or(true);
if !show {
info!(
context,
"Ignoring new message {} from \"{}\".",
message_id,
folder.as_ref(),
);
} else {
// check passed, go fetch the rest
if self.fetch_single_msg(context, &folder, cur_uid).await == 0 {
info!(
context,
"Read error for message {} from \"{}\", trying over later.",
message_id,
folder.as_ref()
);
read_errors += 1;
}
}
} }
if read_errors == 0 { if read_errors == 0 {
new_last_seen_uid = cur_uid; new_last_seen_uid = cur_uid;