Skip to content

Instantly share code, notes, and snippets.

@thomcc
Created April 13, 2017 16:41
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save thomcc/47319c68649b9d3347620b9aaf71d3bd to your computer and use it in GitHub Desktop.
Save thomcc/47319c68649b9d3347620b9aaf71d3bd to your computer and use it in GitHub Desktop.
diff --git a/services/sync/modules/engines.js b/services/sync/modules/engines.js
index 3a767d1..1f08bde4 100644
--- a/services/sync/modules/engines.js
+++ b/services/sync/modules/engines.js
@@ -1604,7 +1604,6 @@ SyncEngine.prototype = {
let up = new Collection(this.engineURL, null, this.service);
let modifiedIDs = this._modified.ids();
let counts = { failed: 0, sent: 0 };
- let uploadedAsStrong = [];
if (modifiedIDs.length) {
this._log.trace("Preparing " + modifiedIDs.length +
" outgoing records");
@@ -1646,16 +1645,6 @@ SyncEngine.prototype = {
for (let id of successful) {
this._modified.delete(id);
- // This check shouldn't be necessary, if we do a "strong" upload of a
- // record that we want to force a tombstone of (e.g. because it
- // shouldn't exist on the server in the first place), it should be
- // uploaded as a tombstone. That said, this check seems worth making
- // for the sake of sanity.
- let weakUploadMetadata = this._needWeakUpload.get(id);
- if (!weakUploadMetadata || !weakUploadMetadata.forceTombstone) {
- this._needWeakUpload.delete(id);
- uploadedAsStrong.push(id);
- }
}
this._onRecordsWritten(successful, failed);
@@ -1719,10 +1708,6 @@ SyncEngine.prototype = {
}
this._log.warn("Weak upload failed", e);
}
- } else if (uploadedAsStrong.length) {
- Observers.notify("weave:engine:sync:weak-uploaded",
- { discarded: new Set(), failed: false }, this.name);
- this._log.trace(`No weak upload needed -- ${uploadedAsStrong.length} items uploaded as strong`);
} else {
this._log.trace("No items queued for weak upload");
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment