From fd53cf012422692abaee0934d9590e9698e2323e Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 21 May 2014 09:15:50 +0100 Subject: [PATCH] tell tpds sender to use pub url for docstore --- .../coffee/Features/ThirdPartyDataStore/TpdsUpdateSender.coffee | 2 +- services/web/config/settings.defaults.coffee | 1 + .../coffee/ThirdPartyDataStore/TpdsUpdateSenderTests.coffee | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/services/web/app/coffee/Features/ThirdPartyDataStore/TpdsUpdateSender.coffee b/services/web/app/coffee/Features/ThirdPartyDataStore/TpdsUpdateSender.coffee index 97da0d44df..ccaddc22a1 100644 --- a/services/web/app/coffee/Features/ThirdPartyDataStore/TpdsUpdateSender.coffee +++ b/services/web/app/coffee/Features/ThirdPartyDataStore/TpdsUpdateSender.coffee @@ -42,7 +42,7 @@ module.exports = addDoc : (options, sl_req_id, callback = (err)->)-> metrics.inc("tpds.add-doc") {callback, sl_req_id} = slReqIdHelper.getCallbackAndReqId(callback, sl_req_id) - options.streamOrigin = settings.apis.docstore.url + path.join("/project/#{options.project_id}/doc/","#{options.doc_id}/raw") + options.streamOrigin = settings.apis.docstore.pubUrl + path.join("/project/#{options.project_id}/doc/","#{options.doc_id}/raw") @_addEntity(options, sl_req_id, callback)    diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index 15667fdd0c..276e513efd 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -76,6 +76,7 @@ module.exports = url : "http://localhost:3015" docstore: url : "http://localhost:3016" + pubUrl: "http://localhost:3016" versioning: snapshotwaitms:3000 url: "http://localhost:4000" diff --git a/services/web/test/UnitTests/coffee/ThirdPartyDataStore/TpdsUpdateSenderTests.coffee b/services/web/test/UnitTests/coffee/ThirdPartyDataStore/TpdsUpdateSenderTests.coffee index d54c8d2847..28dcce5571 100644 --- a/services/web/test/UnitTests/coffee/ThirdPartyDataStore/TpdsUpdateSenderTests.coffee +++ b/services/web/test/UnitTests/coffee/ThirdPartyDataStore/TpdsUpdateSenderTests.coffee @@ -33,7 +33,7 @@ describe 'TpdsUpdateSender', -> filestore: url: filestoreUrl docstore: - url: @docstoreUrl + pubUrl: @docstoreUrl redis:fairy:{} "logger-sharelatex":{log:->} '../../models/Project': Project:@Project