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

added some better error logging

Browse source
This commit is contained in:
Henry Oswald 2015-08-13 13:59:12 +01:00
parent 859e8a0e57
commit b8884352f6
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/docstore/app/coffee/DocArchiveManager.coffee
View file

@ -35,7 +35,7 @@ module.exports = DocArchive =
md5lines = crypto.createHash("md5").update(JSON.stringify(doc.lines)).digest("hex")
md5response = res.headers.etag.toString().replace(/\"/g, '')
if md5lines != md5response
logger.err responseMD5:md5response, linesMD5:md5lines, project_id:project_id, doc_id: doc._id, "err in response md5 from s3"
logger.err responseMD5:md5response, linesMD5:md5lines, project_id:project_id, doc_id: doc?._id, "err in response md5 from s3"
return callback new Error("Error in S3 md5 response")
MongoManager.markDocAsArchived doc._id, doc.rev, (err) ->
return callback(err) if err?
@ -61,14 +61,14 @@ module.exports = DocArchive =
options = DocArchive.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"
logger.err err:err, res:res, project_id:project_id, doc_id:doc_id, "something went wrong unarchiving doc from aws"
return callback new Errors.NotFoundError("Error in S3 request")
MongoManager.upsertIntoDocCollection project_id, doc_id.toString(), lines, (err) ->
return callback(err) if err?
logger.log project_id: project_id, doc_id: doc_id, "deleting doc from s3"
request.del options, (err, res, body)->
if err? || res.statusCode != 204
logger.err err:err, res:res, "something went wrong deleting doc from aws"
logger.err err:err, res:res, project_id:project_id, doc_id:doc_id, "something went wrong deleting doc from aws"
return callback new Errors.NotFoundError("Error in S3 request")
callback()
@ -80,7 +80,5 @@ module.exports = DocArchive =
bucket: settings.docstore.s3.bucket
timeout: thirtySeconds
json: content
#headers:
# 'content-md5': crypto.createHash("md5").update(JSON.stringify(content)).digest("hex")
uri:"https://#{settings.docstore.s3.bucket}.s3.amazonaws.com/#{key}"
}

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

@ -20,6 +20,7 @@ module.exports = DocManager =
else if doc?.inS3
DocArchive.unarchiveDoc project_id, doc_id, (err)->
if err?
logger.err err:err, project_id:project_id, doc_id:doc_id, "error unarchiving doc"
return callback(err)
MongoManager.findDoc doc_id, callback
else