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

add withLock to processUncompressedUpdatesForDoc

Browse source
This commit is contained in:
Brian Gough 2017-03-22 16:16:04 +00:00
parent 0dd668416d
commit b1c0ebbaae
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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) ->) ->

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

@ -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
}]
}]