github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-17 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #509 from sharelatex/ja-fix-clsi-cookie-cluster

Browse source 
Don't try to set the server id if it isn't returned in the response
This commit is contained in:
James Allen 2017-05-19 15:00:18 +01:00 committed by GitHub
commit 76b8fecde9
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/coffee/Features/Compile/ClsiCookieManager.coffee
View file

@ -44,6 +44,8 @@ module.exports = ClsiCookieManager =
if !clsiCookiesEnabled
return callback()
serverId = ClsiCookieManager._parseServerIdFromResponse(response)
if !serverId? # We don't get a cookie back if it hasn't changed
return callback()
if rclient_secondary?
@_setServerIdInRedis rclient_secondary, project_id, serverId
@_setServerIdInRedis rclient, project_id, serverId, (err) ->

7
services/web/test/UnitTests/coffee/Compile/ClsiCookieManagerTests.coffee
View file

@ -105,13 +105,18 @@ describe "ClsiCookieManager", ->
serverId.should.equal "clsi-8"
done()
it "should not set the server id if clsiCookies are not enabled", (done)->
delete @settings.clsiCookie.key
@ClsiCookieManager = SandboxedModule.require modulePath, requires:@requires
@ClsiCookieManager.setServerId @project_id, @response, (err, serverId)=>
@redisMulti.exec.called.should.equal false
done()
it "should not set the server id there is no server id in the response", (done)->
@ClsiCookieManager._parseServerIdFromResponse = sinon.stub().returns(null)
@ClsiCookieManager.setServerId @project_id, @response, (err, serverId)=>
@redisMulti.exec.called.should.equal false
done()
it "should also set in the secondary if secondary redis is enabled", (done) ->
@redisSecondaryMulti =