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

removed priority url from proxy to clsi

Browse source
This commit is contained in:
Henry Oswald 2016-06-02 13:11:20 +01:00
parent c284465ba5
commit 14cbf4f1c8
2 changed files with 1 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/app/coffee/Features/Compile/CompileController.coffee
View file

@ -115,9 +115,6 @@ module.exports = CompileController =
if err?
logger.err err:err, "error getting cookie jar for clsi request"
return callback(err)
if limits.compileGroup == "priority"
compilerUrl = Settings.apis.clsi_priority.url
else
compilerUrl = Settings.apis.clsi.url
url = "#{compilerUrl}#{url}"
logger.log url: url, "proxying to CLSI"

42
services/web/test/UnitTests/coffee/Compile/CompileControllerTests.coffee
View file

@ -206,16 +206,6 @@ describe "CompileController", ->
@CompileManager.getProjectCompileLimits = sinon.stub().callsArgWith(1, null, {compileGroup: "priority"})
@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
it "should proxy to the priority url if the user has the feature", ()->
@request
.calledWith(
jar:@jar
method: @req.method
url: "#{@settings.apis.clsi_priority.url}#{@url}",
timeout: 60 * 1000
)
.should.equal true
describe "user with standard priority via query string", ->
beforeEach ->
@req.query = {compileGroup: 'standard'}
@ -239,20 +229,6 @@ describe "CompileController", ->
it "should bind an error handle to the request proxy", ->
@proxy.on.calledWith("error").should.equal true
describe "user with priority compile via query string", ->
beforeEach ->
@req.query = {compileGroup: 'priority'}
@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
it "should proxy to the priority url if the user has the feature", ()->
@request
.calledWith(
jar:@jar
method: @req.method
url: "#{@settings.apis.clsi_priority.url}#{@url}",
timeout: 60 * 1000
)
.should.equal true
describe "user with non-existent priority via query string", ->
beforeEach ->
@ -316,25 +292,7 @@ describe "CompileController", ->
it "should bind an error handle to the request proxy", ->
@proxy.on.calledWith("error").should.equal true
describe "user with priority compile", ->
beforeEach ->
@CompileManager.getProjectCompileLimits = sinon.stub().callsArgWith(1, null, {compileGroup: "priority"})
@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
it "should proxy to the priority url if the user has the feature", ()->
@request
.calledWith(
jar:@jar
method: @req.method
url: "#{@settings.apis.clsi_priority.url}#{@url}",
timeout: 60 * 1000
headers: {
'Range': '123-456'
'If-Range': 'abcdef'
'If-Modified-Since': 'Mon, 15 Dec 2014 15:23:56 GMT'
}
)
.should.equal true
describe "user with build parameter via query string", ->
beforeEach ->