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

Fix scenario where sync worker is re-assigned the same account before fully releasing it

Browse source
This commit is contained in:
Ben Gotow 2016-07-12 18:31:55 -07:00
parent 3e8623d383
commit e89975456b
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/nylas-sync/sync-process-manager.js
View file

@ -194,13 +194,14 @@ class SyncProcessManager {
const dst = ACCOUNTS_UNCLAIMED; const dst = ACCOUNTS_UNCLAIMED;
return PubsubConnector.broadcastClient().lremAsync(src, 1, accountId).then((didRemove) => { return PubsubConnector.broadcastClient().lremAsync(src, 1, accountId).then((didRemove) => {
this._workers[accountId] = null;
if (didRemove) { if (didRemove) {
PubsubConnector.broadcastClient().rpushAsync(dst, accountId) PubsubConnector.broadcastClient().rpushAsync(dst, accountId)
} else { } else {
this._logger.error("Wanted to return item to pool, but didn't have claim on it.") this._logger.error("Wanted to return item to pool, but didn't have claim on it.")
return return
} }
this._workers[accountId] = null;
}); });
} }
} }

1
packages/nylas-sync/sync-worker.js
View file

@ -225,6 +225,7 @@ class SyncWorker {
this._account.lastSyncCompletions = lastSyncCompletions this._account.lastSyncCompletions = lastSyncCompletions
this._account.save() this._account.save()
this._logger.info('Syncworker: Completed sync cycle') this._logger.info('Syncworker: Completed sync cycle')
if (afterSync === 'idle') { if (afterSync === 'idle') {