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

changed style of async jobs to map to use underscore which is like we

Browse source 
use in the rest of the stack. Also removed a few => binds which are
not needed
This commit is contained in:
Henry Oswald 2015-06-02 10:59:35 +01:00
parent 7c7ff64904
commit 19f1a9ad82
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
services/docstore/app/coffee/DocManager.coffee
View file

@ -70,18 +70,17 @@ module.exports = DocManager =
else if !docs?
return callback new Errors.NotFoundError("No docs for project #{project_id}")
jobs = for doc in docs
do (doc) =>
(cb) =>
logger.log project_id: project_id, doc_id: doc._id, "sending doc to s3"
options = buildS3Options(doc.lines, project_id+"/"+doc._id)
request.put options, (err, res)->
if err? || res.statusCode != 200
logger.err err:err, res:res, "something went wrong archiving doc in aws"
cb(err)
MongoManager.markDocAsArchived doc._id, (error) ->
return cb(error) if error?
cb()
jobs = _.map docs, (doc) ->
(cb)->
logger.log project_id: project_id, doc_id: doc._id, "sending doc to s3"
options = buildS3Options(doc.lines, project_id+"/"+doc._id)
request.put options, (err, res)->
if err? || res.statusCode != 200
logger.err err:err, res:res, "something went wrong archiving doc in aws"
cb(err)
MongoManager.markDocAsArchived doc._id, (error) ->
return cb(error) if error?
cb()
async.series jobs, callback
@ -92,21 +91,20 @@ module.exports = DocManager =
else if !docs?
return callback new Errors.NotFoundError("No docs for project #{project_id}")
jobs = for doc in docs
do (doc) =>
jobs = _.map docs, (doc) ->
(cb)->
if !doc.inS3?
(cb) => cb()
return cb()
else
(cb) =>
logger.log project_id: project_id, doc_id: doc._id, "getting doc from s3"
options = buildS3Options(true, project_id+"/"+doc._id)
request.get options, (err, res, lines)->
if err? || res.statusCode != 200
logger.err err:err, res:res, "something went wrong unarchiving doc from aws"
cb(err)
MongoManager.upsertIntoDocCollection project_id, doc._id.toString(), lines, (error) ->
return cb(error) if error?
cb()
logger.log project_id: project_id, doc_id: doc._id, "getting doc from s3"
options = buildS3Options(true, project_id+"/"+doc._id)
request.get options, (err, res, lines)->
if err? || res.statusCode != 200
logger.err err:err, res:res, "something went wrong unarchiving doc from aws"
cb(err)
MongoManager.upsertIntoDocCollection project_id, doc._id.toString(), lines, (error) ->
return cb(error) if error?
cb()
async.series jobs, callback