diff --git a/services/track-changes/app/coffee/UpdatesManager.coffee b/services/track-changes/app/coffee/UpdatesManager.coffee index 0060126e71..6b581bcd53 100644 --- a/services/track-changes/app/coffee/UpdatesManager.coffee +++ b/services/track-changes/app/coffee/UpdatesManager.coffee @@ -118,11 +118,11 @@ module.exports = UpdatesManager = processUncompressedUpdatesWithLock: (project_id, doc_id, callback = (error) ->) -> UpdatesManager._prepareProjectForUpdates project_id, (error, temporary) -> return callback(error) if error? - UpdatesManager._processUncompressedUpdatesForDoc project_id, doc_id, temporary, callback + UpdatesManager._processUncompressedUpdatesForDocWithLock project_id, doc_id, temporary, callback # Process updates for a doc when the whole project is flushed (internal method) - _processUncompressedUpdatesForDoc: (project_id, doc_id, temporary, callback = (error) ->) -> + _processUncompressedUpdatesForDocWithLock: (project_id, doc_id, temporary, callback = (error) ->) -> UpdatesManager._prepareDocForUpdates project_id, doc_id, (error) -> return callback(error) if error? LockManager.runWithLock( @@ -141,7 +141,7 @@ module.exports = UpdatesManager = for doc_id in doc_ids do (doc_id) -> jobs.push (cb) -> - UpdatesManager._processUncompressedUpdatesForDoc project_id, doc_id, temporary, cb + UpdatesManager._processUncompressedUpdatesForDocWithLock project_id, doc_id, temporary, cb async.parallelLimit jobs, 5, callback getDocUpdates: (project_id, doc_id, options = {}, callback = (error, updates) ->) -> diff --git a/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee b/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee index 3746cec999..2c3e06832f 100644 --- a/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee +++ b/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee @@ -317,7 +317,7 @@ describe "UpdatesManager", -> @doc_ids = ["mock-id-1", "mock-id-2"] @UpdateTrimmer.shouldTrimUpdates = sinon.stub().callsArgWith(1, null, @temporary = "temp mock") @MongoManager.backportProjectId = sinon.stub().callsArg(2) - @UpdatesManager._processUncompressedUpdatesForDoc = sinon.stub().callsArg(3) + @UpdatesManager._processUncompressedUpdatesForDocWithLock = sinon.stub().callsArg(3) @RedisManager.getDocIdsWithHistoryOps = sinon.stub().callsArgWith(1, null, @doc_ids) @UpdatesManager.processUncompressedUpdatesForProject @project_id, () => @callback() @@ -330,7 +330,7 @@ describe "UpdatesManager", -> it "should process the doc ops for the each doc_id", -> for doc_id in @doc_ids - @UpdatesManager._processUncompressedUpdatesForDoc + @UpdatesManager._processUncompressedUpdatesForDocWithLock .calledWith(@project_id, doc_id, @temporary) .should.equal true @@ -802,4 +802,4 @@ describe "UpdatesManager", -> user_ids: [@user_2.id] start_ts: @now end_ts: @now + 10 - }] \ No newline at end of file + }]