wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

disable tracker for entire sync run. make sure tracker is re-enabled at the end

Browse Source
This commit is contained in:
Dan Mills 2008-12-05 00:55:19 -08:00
parent 912dadd022
commit 95b8e357b2
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
services/sync/modules/engines.js
View File

@ -347,7 +347,7 @@ SyncEngine.prototype = {
} }
}, },
_changeRecordID: function SyncEngine__changeRecordID(oldID, newID) { _changeItemID: function SyncEngine__changeItemID(oldID, newID) {
let self = yield; let self = yield;
throw "_changeRecordID must be overridden in a subclass"; throw "_changeRecordID must be overridden in a subclass";
}, },
@ -390,6 +390,8 @@ SyncEngine.prototype = {
meta.generateIV(); meta.generateIV();
yield meta.addUnwrappedKey(self.cb, pubkey, symkey); yield meta.addUnwrappedKey(self.cb, pubkey, symkey);
yield meta.put(self.cb); yield meta.put(self.cb);
this._tracker.disable();
} }
}, },
@ -522,14 +524,12 @@ SyncEngine.prototype = {
let self = yield; let self = yield;
if (this.incoming.length) { if (this.incoming.length) {
this._log.debug("Applying server changes"); this._log.debug("Applying server changes");
this._tracker.disable();
let inc; let inc;
while ((inc = this.incoming.shift())) { while ((inc = this.incoming.shift())) {
yield this._store.applyIncoming(self.cb, inc); yield this._store.applyIncoming(self.cb, inc);
if (inc.modified > this.lastSync) if (inc.modified > this.lastSync)
this.lastSync = inc.modified; this.lastSync = inc.modified;
} }
this._tracker.enable();
} }
}, },
@ -557,26 +557,33 @@ SyncEngine.prototype = {
let self = yield; let self = yield;
this._log.debug("Finishing up sync"); this._log.debug("Finishing up sync");
this._tracker.resetScore(); this._tracker.resetScore();
this._tracker.enable();
}, },
_sync: function SyncEngine__sync() { _sync: function SyncEngine__sync() {
let self = yield; let self = yield;
yield this._syncStartup.async(this, self.cb); try {
yield this._syncStartup.async(this, self.cb);
// Populate incoming and outgoing queues // Populate incoming and outgoing queues
yield this._generateOutgoing.async(this, self.cb); yield this._generateOutgoing.async(this, self.cb);
yield this._fetchIncoming.async(this, self.cb); yield this._fetchIncoming.async(this, self.cb);
// Decrypt and sort incoming records, then reconcile // Decrypt and sort incoming records, then reconcile
yield this._processIncoming.async(this, self.cb); yield this._processIncoming.async(this, self.cb);
yield this._reconcile.async(this, self.cb); yield this._reconcile.async(this, self.cb);
// Apply incoming records, upload outgoing records // Apply incoming records, upload outgoing records
yield this._applyIncoming.async(this, self.cb); yield this._applyIncoming.async(this, self.cb);
yield this._uploadOutgoing.async(this, self.cb); yield this._uploadOutgoing.async(this, self.cb);
}
yield this._syncFinish.async(this, self.cb); catch (e) {
throw e;
}
finally {
yield this._syncFinish.async(this, self.cb);
}
}, },
_resetServer: function SyncEngine__resetServer() { _resetServer: function SyncEngine__resetServer() {

4
services/sync/modules/engines/bookmarks.js
View File

@ -785,9 +785,9 @@ BookmarksEngine.prototype = {
} }
}, },
_changeRecordID: function BmkEngine__changeRecordID(oldID, newID) { _changeItemID: function BmkEngine__changeRecordID(oldID, newID) {
let self = yield; let self = yield;
yield this._store._changeRecordID.async(this._store, self.cb, oldID, newID); yield this._store._changeItemID.async(this._store, self.cb, oldID, newID);
} }
// XXX for sharing, will need to re-add code to get new shares before syncing, // XXX for sharing, will need to re-add code to get new shares before syncing,