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

if user has premium compile send them to a different server set

Browse source
This commit is contained in:
Henry Oswald 2014-10-16 17:52:21 +01:00
parent 5a4a90924b
commit 7293ccf06d
2 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/web/app/coffee/Features/Compile/ClsiManager.coffee
View file

@ -12,7 +12,7 @@ module.exports = ClsiManager =
ClsiManager._buildRequest project_id, settingsOverride, (error, req) -> ClsiManager._buildRequest project_id, settingsOverride, (error, req) ->
return callback(error) if error? return callback(error) if error?
logger.log project_id: project_id, "sending compile to CLSI" logger.log project_id: project_id, "sending compile to CLSI"
ClsiManager._postToClsi project_id, req, (error, response) -> ClsiManager._postToClsi project_id, req, settingsOverride.compiler, (error, response) ->
return callback(error) if error? return callback(error) if error?
logger.log project_id: project_id, response: response, "received compile response from CLSI" logger.log project_id: project_id, response: response, "received compile response from CLSI"
callback( callback(
@ -29,9 +29,13 @@ module.exports = ClsiManager =
deleteAuxFiles: (project_id, callback = (error) ->) -> deleteAuxFiles: (project_id, callback = (error) ->) ->
request.del "#{Settings.apis.clsi.url}/project/#{project_id}", callback request.del "#{Settings.apis.clsi.url}/project/#{project_id}", callback
_postToClsi: (project_id, req, callback = (error, response) ->) -> _postToClsi: (project_id, req, compiler, callback = (error, response) ->) ->
if compiler == "priority"
compilerUrl = Settings.apis.clsi_priority.url
else
compilerUrl = Settings.apis.clsi.url
request.post { request.post {
url: "#{Settings.apis.clsi.url}/project/#{project_id}/compile" url: "#{compilerUrl}/project/#{project_id}/compile"
json: req json: req
jar: false jar: false
}, (error, response, body) -> }, (error, response, body) ->

26
services/web/test/UnitTests/coffee/Compile/ClsiManagerTests.coffee
View file

@ -15,6 +15,8 @@ describe "ClsiManager", ->
secret: "secret" secret: "secret"
clsi: clsi:
url: "http://clsi.example.com" url: "http://clsi.example.com"
clsi_priority:
url: "https://clsipremium.example.com"
"../../models/Project": Project: @Project = {} "../../models/Project": Project: @Project = {}
"../Project/ProjectEntityHandler": @ProjectEntityHandler = {} "../Project/ProjectEntityHandler": @ProjectEntityHandler = {}
"logger-sharelatex": @logger = { log: sinon.stub(), error: sinon.stub() } "logger-sharelatex": @logger = { log: sinon.stub(), error: sinon.stub() }
@ -28,7 +30,7 @@ describe "ClsiManager", ->
describe "with a successful compile", -> describe "with a successful compile", ->
beforeEach -> beforeEach ->
@ClsiManager._postToClsi = sinon.stub().callsArgWith(2, null, { @ClsiManager._postToClsi = sinon.stub().callsArgWith(3, null, {
compile: compile:
status: @status = "success" status: @status = "success"
outputFiles: [{ outputFiles: [{
@ -39,7 +41,7 @@ describe "ClsiManager", ->
type: "log" type: "log"
}] }]
}) })
@ClsiManager.sendRequest @project_id, {}, @callback @ClsiManager.sendRequest @project_id, {compiler:"standard"}, @callback
it "should build the request", -> it "should build the request", ->
@ClsiManager._buildRequest @ClsiManager._buildRequest
@ -48,7 +50,7 @@ describe "ClsiManager", ->
it "should send the request to the CLSI", -> it "should send the request to the CLSI", ->
@ClsiManager._postToClsi @ClsiManager._postToClsi
.calledWith(@project_id, @request) .calledWith(@project_id, @request, "standard")
.should.equal true .should.equal true
it "should call the callback with the status and output files", -> it "should call the callback with the status and output files", ->
@ -63,7 +65,7 @@ describe "ClsiManager", ->
describe "with a failed compile", -> describe "with a failed compile", ->
beforeEach -> beforeEach ->
@ClsiManager._postToClsi = sinon.stub().callsArgWith(2, null, { @ClsiManager._postToClsi = sinon.stub().callsArgWith(3, null, {
compile: compile:
status: @status = "failure" status: @status = "failure"
}) })
@ -208,7 +210,7 @@ describe "ClsiManager", ->
describe "successfully", -> describe "successfully", ->
beforeEach -> beforeEach ->
@request.post = sinon.stub().callsArgWith(1, null, {statusCode: 204}, @body = { mock: "foo" }) @request.post = sinon.stub().callsArgWith(1, null, {statusCode: 204}, @body = { mock: "foo" })
@ClsiManager._postToClsi @project_id, @req, @callback @ClsiManager._postToClsi @project_id, @req, "standard", @callback
it 'should send the request to the CLSI', -> it 'should send the request to the CLSI', ->
url = "#{@settings.apis.clsi.url}/project/#{@project_id}/compile" url = "#{@settings.apis.clsi.url}/project/#{@project_id}/compile"
@ -224,8 +226,20 @@ describe "ClsiManager", ->
describe "when the CLSI returns an error", -> describe "when the CLSI returns an error", ->
beforeEach -> beforeEach ->
@request.post = sinon.stub().callsArgWith(1, null, {statusCode: 500}, @body = { mock: "foo" }) @request.post = sinon.stub().callsArgWith(1, null, {statusCode: 500}, @body = { mock: "foo" })
@ClsiManager._postToClsi @project_id, @req, @callback @ClsiManager._postToClsi @project_id, @req, "standard", @callback
it "should call the callback with the body and the error", -> it "should call the callback with the body and the error", ->
@callback.calledWith(new Error("CLSI returned non-success code: 500"), @body).should.equal true @callback.calledWith(new Error("CLSI returned non-success code: 500"), @body).should.equal true
describe "when the compiler is priority", ->
beforeEach ->
@request.post = sinon.stub().callsArgWith(1, null, {statusCode: 500}, @body = { mock: "foo" })
@ClsiManager._postToClsi @project_id, @req, "priority", @callback
it "should use the clsi_priority url", ->
url = "#{@settings.apis.clsi_priority.url}/project/#{@project_id}/compile"
@request.post.calledWith({
url: url
json: @req
jar: false
}).should.equal true