Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-09-07 13:14:47 +08:00
Code Issues Projects Releases Packages Wiki Activity

[local-sync] Fix sync worker

Browse source 
- Correctly await async functions
- Make sync in progress more explicit
This commit is contained in:
Juan Tejada 2016-12-16 11:37:34 -08:00
parent e77fbc21e1
commit 86a2b13730
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/local-sync/src/local-sync-worker/sync-worker.js
View file

@ -23,6 +23,7 @@ class SyncWorker {
this._lastSyncTime = null;
this._logger = global.Logger.forAccount(account)
this._interrupted = false
this._syncInProgress = false
this._syncAttemptsWhileInProgress = 0
this._destroyed = false;
@ -225,8 +226,7 @@ class SyncWorker {
}
async syncNow({reason, priority = 1} = {}) {
const syncInProgress = (this._syncTimer === null);
if (syncInProgress) {
if (this._syncInProgress) {
this._syncAttemptsWhileInProgress += priority
if (this._syncAttemptsWhileInProgress >= RESTART_THRESHOLD) {
this._interrupted = true
@ -238,6 +238,7 @@ class SyncWorker {
this._syncTimer = null;
this._interrupted = false
this._syncAttemptsWhileInProgress = 0
this._syncInProgress = true
try {
await this._account.reload();
@ -274,10 +275,11 @@ class SyncWorker {
await this.cleanupOrphanMessages();
await this.onSyncDidComplete();
} catch (error) {
this.onSyncError(error);
await this.onSyncError(error);
} finally {
this._lastSyncTime = Date.now()
this.scheduleNextSync()
this._syncInProgress = false
await this.scheduleNextSync()
}
}