agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-25 02:00:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "priority compiles are proxyed to the priority servers"

Browse Source 
This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.
This commit is contained in:
Henry Oswald
2014-10-21 09:16:23 +01:00
parent 250606472d
commit fb53be7ce4
2 changed files with 22 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/web/app/coffee/Features/Compile/CompileController.coffee
View File

@@ -64,17 +64,10 @@ module.exports = CompileController =
proxyToClsi: (url, req, res, next = (error) ->) ->
logger.log url: url, "proxying to CLSI"
AuthenticationController.getLoggedInUserId req, (error, user_id) ->
UserGetter.getUser user_id, {"features.compileGroup":1, "features.compileTimeout":1}, (err, user)->
if user.features?.compileGroup == "priority"
compilerUrl = Settings.apis.clsi_priority.url
else
compilerUrl = Settings.apis.clsi.url
url = "#{compilerUrl}#{url}"
oneMinute = 60 * 1000
proxy = request(url: url, method: req.method, timeout: oneMinute)
proxy.pipe(res)
proxy.on "error", (error) ->
logger.warn err: error, url: url, "CLSI proxy error"
url = "#{Settings.apis.clsi.url}#{url}"
oneMinute = 60 * 1000
proxy = request(url: url, method: req.method, timeout: oneMinute)
proxy.pipe(res)
proxy.on "error", (error) ->
logger.warn err: error, url: url, "CLSI proxy error"

63
services/web/test/UnitTests/coffee/Compile/CompileControllerTests.coffee
View File

@@ -20,8 +20,6 @@ describe "CompileController", ->
apis:
clsi:
url: "clsi.example.com"
clsi_priority:
url: "clsi-priority.example.com"
"request": @request = sinon.stub()
"../../models/Project": Project: @Project = {}
"logger-sharelatex": @logger = { log: sinon.stub(), error: sinon.stub() }
@@ -147,50 +145,24 @@ describe "CompileController", ->
statusCode: 204
headers: { "mock": "header" }
@req.method = "mock-method"
@AuthenticationController.getLoggedInUserId = sinon.stub().callsArgWith(1, null, @user_id = "mock-user-id")
describe "user with standard priority", ->
beforeEach ->
@UserGetter.getUser.callsArgWith(2, null, @user)
@CompileController.proxyToClsi(@url = "/test", @req, @res, @next)
it "should open a request to the CLSI", ->
@request
.calledWith(
method: @req.method
url: "#{@settings.apis.clsi.url}#{@url}",
timeout: 60 * 1000
)
.should.equal true
it "should pass the request on to the client", ->
@proxy.pipe
.calledWith(@res)
.should.equal true
it "should bind an error handle to the request proxy", ->
@proxy.on.calledWith("error").should.equal true
describe "user with priority compile", ->
beforeEach ->
@user.features.compileGroup = "priority"
@UserGetter.getUser.callsArgWith(2, null, @user)
@CompileController.proxyToClsi(@url = "/test", @req, @res, @next)
it "should proxy to the priorty url if the user has the feature", ()->
@request
.calledWith(
method: @req.method
url: "#{@settings.apis.clsi_priority.url}#{@url}",
timeout: 60 * 1000
)
.should.equal true
@CompileController.proxyToClsi(@url = "/test", @req, @res, @next)
it "should open a request to the CLSI", ->
@request
.calledWith(
method: @req.method
url: "#{@settings.apis.clsi.url}#{@url}",
timeout: 60 * 1000
)
.should.equal true
it "should pass the request on to the client", ->
@proxy.pipe
.calledWith(@res)
.should.equal true
it "should bind an error handle to the request proxy", ->
@proxy.on.calledWith("error").should.equal true
describe "deleteAuxFiles", ->
beforeEach ->
@@ -229,8 +201,3 @@ describe "CompileController", ->
@CompileController.compileAndDownloadPdf @req, @res
@CompileController.proxyToClsi.calledWith("/project/#{@project_id}/output/output.pdf", @req, @res).should.equal true
done()