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

Don't throw fatal error when recently compiled

Browse source
This commit is contained in:
James Allen 2016-03-21 13:54:45 +00:00
parent 8bfc613bb3
commit 9a0ec9c292
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,8 @@ module.exports = CompileManager =
CompileManager._checkIfRecentlyCompiled project_id, user_id, (error, recentlyCompiled) -> CompileManager._checkIfRecentlyCompiled project_id, user_id, (error, recentlyCompiled) ->
return callback(error) if error? return callback(error) if error?
if recentlyCompiled if recentlyCompiled
return callback new Error("project was recently compiled so not continuing") logger.warn {project_id, user_id}, "project was recently compiled so not continuing"
return callback null, "too-recently-compiled", []
CompileManager._ensureRootDocumentIsSet project_id, (error) -> CompileManager._ensureRootDocumentIsSet project_id, (error) ->
return callback(error) if error? return callback(error) if error?

13
services/web/test/UnitTests/coffee/Compile/CompileManagerTests.coffee
View file

@ -27,7 +27,7 @@ describe "CompileManager", ->
Timer: class Timer Timer: class Timer
done: sinon.stub() done: sinon.stub()
inc: sinon.stub() inc: sinon.stub()
"logger-sharelatex": @logger = { log: sinon.stub() } "logger-sharelatex": @logger = { log: sinon.stub(), warn: sinon.stub() }
@project_id = "mock-project-id-123" @project_id = "mock-project-id-123"
@user_id = "mock-user-id-123" @user_id = "mock-user-id-123"
@callback = sinon.stub() @callback = sinon.stub()
@ -90,15 +90,12 @@ describe "CompileManager", ->
.should.equal true .should.equal true
describe "when the project has been recently compiled", -> describe "when the project has been recently compiled", ->
beforeEach -> it "should return", (done)->
@CompileManager._checkIfAutoCompileLimitHasBeenHit = (_, cb)-> cb(null, true) @CompileManager._checkIfAutoCompileLimitHasBeenHit = (_, cb)-> cb(null, true)
@CompileManager._checkIfRecentlyCompiled = sinon.stub().callsArgWith(2, null, true) @CompileManager._checkIfRecentlyCompiled = sinon.stub().callsArgWith(2, null, true)
@CompileManager.compile @project_id, @user_id, {}, @callback @CompileManager.compile @project_id, @user_id, {}, (err, status)->
status.should.equal "too-recently-compiled"
it "should return the callback with an error", -> done()
@callback
.calledWith(new Error("project was recently compiled so not continuing"))
.should.equal true
describe "should check the rate limit", -> describe "should check the rate limit", ->
it "should return", (done)-> it "should return", (done)->