github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add error handling of mismatched versions back in

Browse source
This commit is contained in:
James Allen 2014-05-01 10:26:01 +01:00
parent eebfa6499e
commit 24343a38cd
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/track-changes/app/coffee/UpdatesManager.coffee
View file

@ -22,7 +22,6 @@ module.exports = UpdatesManager =
while rawUpdates[0]? and rawUpdates[0].v <= lastCompressedUpdate.v while rawUpdates[0]? and rawUpdates[0].v <= lastCompressedUpdate.v
rawUpdates.shift() rawUpdates.shift()
### TODO: Restore this when errors have died down after the Sunday crash.
if rawUpdates[0]? and rawUpdates[0].v != lastCompressedUpdate.v + 1 if rawUpdates[0]? and rawUpdates[0].v != lastCompressedUpdate.v + 1
error = new Error("Tried to apply raw op at version #{rawUpdates[0].v} to last compressed update with version #{lastCompressedUpdate.v}") error = new Error("Tried to apply raw op at version #{rawUpdates[0].v} to last compressed update with version #{lastCompressedUpdate.v}")
logger.error err: error, doc_id: doc_id, project_id: project_id, "inconsistent doc versions" logger.error err: error, doc_id: doc_id, project_id: project_id, "inconsistent doc versions"
@ -31,7 +30,6 @@ module.exports = UpdatesManager =
MongoManager.insertCompressedUpdates project_id, doc_id, [lastCompressedUpdate], () -> MongoManager.insertCompressedUpdates project_id, doc_id, [lastCompressedUpdate], () ->
return callback error return callback error
return return
###
compressedUpdates = UpdateCompressor.compressRawUpdates lastCompressedUpdate, rawUpdates compressedUpdates = UpdateCompressor.compressRawUpdates lastCompressedUpdate, rawUpdates
MongoManager.insertCompressedUpdates project_id, doc_id, compressedUpdates, (error) -> MongoManager.insertCompressedUpdates project_id, doc_id, compressedUpdates, (error) ->

2
services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee
View file

@ -104,7 +104,6 @@ describe "UpdatesManager", ->
.calledWith(@lastCompressedUpdate, @rawUpdates.slice(-2)) .calledWith(@lastCompressedUpdate, @rawUpdates.slice(-2))
.should.equal true .should.equal true
###
describe "when the raw ops do not follow from the last compressed op version", -> describe "when the raw ops do not follow from the last compressed op version", ->
beforeEach -> beforeEach ->
@rawUpdates = [{ v: 13, op: "mock-op-13" }] @rawUpdates = [{ v: 13, op: "mock-op-13" }]
@ -120,7 +119,6 @@ describe "UpdatesManager", ->
@MongoManager.insertCompressedUpdates @MongoManager.insertCompressedUpdates
.calledWith(@project_id, @doc_id, [@lastCompressedUpdate]) .calledWith(@project_id, @doc_id, [@lastCompressedUpdate])
.should.equal true .should.equal true
###
describe "processUncompressedUpdates", -> describe "processUncompressedUpdates", ->
beforeEach -> beforeEach ->