fixed bug where file uploader was calling cb on read stream not write stream, race condition created.

This commit is contained in:
Henry Oswald 2014-02-14 18:13:22 +00:00
parent b46f320882
commit 65f849aad0
2 changed files with 6 additions and 2 deletions

View file

@ -13,7 +13,7 @@ module.exports =
uri: @_buildUrl(project_id, file_id)
writeStream = request(opts)
readStream.pipe writeStream
readStream.on "end", callback
writeStream.on "end", callback
readStream.on "error", (err)->
logger.err err:err, project_id:project_id, file_id:file_id, fsPath:fsPath, "something went wrong on the read stream of uploadFileFromDisk"
callback err

View file

@ -10,7 +10,11 @@ describe "FileStoreHandler", ->
beforeEach ->
@fs =
createReadStream : sinon.stub()
@writeStream = {my:"writeStream", on:->}
@writeStream =
my:"writeStream"
on: (type, cb)->
if type == "end"
cb()
@readStream = {my:"readStream"}
@request = sinon.stub()
@settings = apis:{filestore:{url:"http//filestore.sharelatex.test"}}