nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reduce email prefetcher debug verbosity a bit

Browse source
This commit is contained in:
Michael Gratton 2019-02-15 01:25:01 +11:00 • committed by Michael James Gratton
parent 75d35ab76d
commit 0d3733b025
1 changed files with 38 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/engine/imap-engine/imap-engine-email-prefetcher.vala
View file

@ -77,54 +77,62 @@ private class Geary.ImapEngine.EmailPrefetcher : Geary.BaseObject {
// emails should include PROPERTIES
private void schedule_prefetch(Gee.Collection<Geary.Email>? emails) {
if (emails == null || emails.size == 0)
return;
if (emails != null && emails.size > 0) {
this.prefetch_emails.add_all(emails);
debug("%s: scheduling %d emails for prefetching",
folder.to_string(), emails.size);
this.prefetch_emails.add_all(emails);
// only increment active state if not rescheduling
if (!this.prefetch_timer.is_running) {
this.active_sem.acquire();
}
// only increment active state if not rescheduling
if (!this.prefetch_timer.is_running) {
this.active_sem.acquire();
this.prefetch_timer.start();
}
this.prefetch_timer.start();
}
private async void do_prepare_all_local_async() {
Gee.List<Geary.Email>? list = null;
try {
debug("Listing all emails needing prefetching in %s...", folder.to_string());
list = yield folder.local_folder.list_email_by_id_async(null, int.MAX,
Geary.Email.Field.PROPERTIES, ImapDB.Folder.ListFlags.ONLY_INCOMPLETE, cancellable);
debug("Listed all emails needing prefetching in %s", folder.to_string());
} catch (Error err) {
debug("Error while list local emails for %s: %s", folder.to_string(), err.message);
list = yield this.folder.local_folder.list_email_by_id_async(
null, int.MAX,
Geary.Email.Field.PROPERTIES,
ImapDB.Folder.ListFlags.ONLY_INCOMPLETE,
this.cancellable
);
} catch (GLib.IOError.CANCELLED err) {
// all good
} catch (GLib.Error err) {
warning("%s: Error listing email on open: %s",
folder.to_string(), err.message);
}
debug("%s: Scheduling %d messages on open for prefetching",
this.folder.to_string(), list != null ? list.size : 0);
schedule_prefetch(list);
active_sem.blind_notify();
this.active_sem.blind_notify();
}
private async void do_prepare_new_async(Gee.Collection<Geary.EmailIdentifier> ids) {
Gee.List<Geary.Email>? list = null;
try {
debug("Listing new %d emails needing prefetching in %s...", ids.size, folder.to_string());
list = yield folder.local_folder.list_email_by_sparse_id_async(
list = yield this.folder.local_folder.list_email_by_sparse_id_async(
(Gee.Collection<ImapDB.EmailIdentifier>) ids,
Geary.Email.Field.PROPERTIES, ImapDB.Folder.ListFlags.ONLY_INCOMPLETE, cancellable);
debug("Listed new emails needing prefetching in %s", folder.to_string());
} catch (Error err) {
debug("Error while list local emails for %s: %s", folder.to_string(), err.message);
Geary.Email.Field.PROPERTIES,
ImapDB.Folder.ListFlags.ONLY_INCOMPLETE,
this.cancellable
);
} catch (GLib.IOError.CANCELLED err) {
// all good
} catch (GLib.Error err) {
warning("%s: Error listing email on open: %s",
folder.to_string(), err.message);
}
debug("%s: Scheduling %d new emails for prefetching",
this.folder.to_string(), list != null ? list.size : 0);
schedule_prefetch(list);
active_sem.blind_notify();
this.active_sem.blind_notify();
}
private async void do_prefetch_async() {
int token = Nonblocking.Mutex.INVALID_TOKEN;
try {