Просмотр исходного кода

Add error handling of mismatched versions back in

James Allen 12 лет назад
Родитель
Сommit
24343a38cd

+ 0 - 2
services/track-changes/app/coffee/UpdatesManager.coffee

@@ -22,7 +22,6 @@ module.exports = UpdatesManager =
 				while rawUpdates[0]? and rawUpdates[0].v <= lastCompressedUpdate.v
 					rawUpdates.shift()
 
-				### TODO: Restore this when errors have died down after the Sunday crash.
 				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}")
 					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], () ->
 						return callback error
 					return
-				###
 
 			compressedUpdates = UpdateCompressor.compressRawUpdates lastCompressedUpdate, rawUpdates
 			MongoManager.insertCompressedUpdates project_id, doc_id, compressedUpdates, (error) ->

+ 0 - 2
services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee

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