From 42f2afc4dda8aa31d58cf6d61b6a8f24d8e99a29 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Wed, 3 Jun 2015 20:05:15 -0300 Subject: [PATCH] remove unarchived docs from s3 --- services/docstore/app/coffee/DocArchiveManager.coffee | 7 ++++++- .../docstore/test/unit/coffee/DocArchiveManager.coffee | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/services/docstore/app/coffee/DocArchiveManager.coffee b/services/docstore/app/coffee/DocArchiveManager.coffee index 206dc929f5..d82067737e 100644 --- a/services/docstore/app/coffee/DocArchiveManager.coffee +++ b/services/docstore/app/coffee/DocArchiveManager.coffee @@ -60,7 +60,12 @@ module.exports = DocArchive = return callback new Errors.NotFoundError("Error in S3 request") MongoManager.upsertIntoDocCollection project_id, doc_id.toString(), lines, (error) -> return callback(error) if error? - callback() + 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" + return callback new Errors.NotFoundError("Error in S3 request") + callback() buildS3Options: (content, key)-> return { diff --git a/services/docstore/test/unit/coffee/DocArchiveManager.coffee b/services/docstore/test/unit/coffee/DocArchiveManager.coffee index dcd425138b..33d5205e85 100644 --- a/services/docstore/test/unit/coffee/DocArchiveManager.coffee +++ b/services/docstore/test/unit/coffee/DocArchiveManager.coffee @@ -25,6 +25,7 @@ describe "DocArchiveManager", -> @request = put: {} get: {} + del: {} @docs = [{ _id: ObjectId() @@ -98,7 +99,8 @@ describe "DocArchiveManager", -> describe "unarchiveDoc", -> it "should use correct options", (done)-> - @request.get = sinon.stub().callsArgWith(1, null, statusCode:200, @docs[0].lines) + @request.get = sinon.stub().callsArgWith(1, null, statusCode:200, @docs[0].lines) + @request.del = sinon.stub().callsArgWith(1, null, statusCode:204, {}) @requires["request"] = @request @DocArchiveManager = SandboxedModule.require modulePath, requires: @requires