From 71af89902da040e9c7e725c94bfcad1ecf33e121 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 8 Apr 2014 20:52:02 +0100 Subject: [PATCH] removed the buffering from update merger, shouldn't be needed in node 0.10 --- .../app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee | 2 -- services/web/app/coffee/router.coffee | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee b/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee index 3a787bc985..b9e9ddc895 100644 --- a/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee +++ b/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee @@ -94,8 +94,6 @@ module.exports = logger.log project_id:project_id, file_id:file_id, dumpPath:dumpPath, "tpds update write stream finished" callback null, dumpPath - if stream.emitBufferedData? - stream.emitBufferedData() stream.resume() diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index eb56539f48..dc2ea53f54 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -142,7 +142,7 @@ module.exports = class Router app.post '/project/:Project_id/doc/:doc_id', httpAuth, DocumentController.setDocument app.ignoreCsrf('post', '/project/:Project_id/doc/:doc_id') - app.post '/user/:user_id/update/*', httpAuth, Project.startBufferingRequest, TpdsController.mergeUpdate + app.post '/user/:user_id/update/*', httpAuth, TpdsController.mergeUpdate app.del '/user/:user_id/update/*', httpAuth, TpdsController.deleteUpdate app.ignoreCsrf('post', '/user/:user_id/update/*') app.ignoreCsrf('delete', '/user/:user_id/update/*')