github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

clear serverid on every compile check

Browse source
This commit is contained in:
Brian Gough 2016-08-31 16:10:24 +01:00
parent b95a2c6d04
commit e82411ac79
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,10 @@ module.exports = ClsiCookieManager =
multi.exec (err)-> multi.exec (err)->
callback(err, serverId) callback(err, serverId)
clearServerId: (project_id, callback = (err)->)->
if !clsiCookiesEnabled
return callback()
rclient.del buildKey(project_id), callback
getCookieJar: (project_id, callback = (err, jar)->)-> getCookieJar: (project_id, callback = (err, jar)->)->
if !clsiCookiesEnabled if !clsiCookiesEnabled

5
services/web/app/coffee/router.coffee
View file

@ -22,6 +22,7 @@ UserPagesController = require('./Features/User/UserPagesController')
DocumentController = require('./Features/Documents/DocumentController') DocumentController = require('./Features/Documents/DocumentController')
CompileManager = require("./Features/Compile/CompileManager") CompileManager = require("./Features/Compile/CompileManager")
CompileController = require("./Features/Compile/CompileController") CompileController = require("./Features/Compile/CompileController")
ClsiCookieManager = require("./Features/Compile/ClsiCookieManager")
HealthCheckController = require("./Features/HealthCheck/HealthCheckController") HealthCheckController = require("./Features/HealthCheck/HealthCheckController")
ProjectDownloadsController = require "./Features/Downloads/ProjectDownloadsController" ProjectDownloadsController = require "./Features/Downloads/ProjectDownloadsController"
FileStoreController = require("./Features/FileStore/FileStoreController") FileStoreController = require("./Features/FileStore/FileStoreController")
@ -251,9 +252,11 @@ module.exports = class Router
apiRouter.get '/health_check/redis', HealthCheckController.checkRedis apiRouter.get '/health_check/redis', HealthCheckController.checkRedis
apiRouter.get "/status/compiler/:Project_id", AuthorizationMiddlewear.ensureUserCanReadProject, (req, res) -> apiRouter.get "/status/compiler/:Project_id", AuthorizationMiddlewear.ensureUserCanReadProject, (req, res) ->
project_id = req.params.Project_id
sendRes = _.once (statusCode, message)-> sendRes = _.once (statusCode, message)->
res.status statusCode res.status statusCode
res.send message res.send message
ClsiCookieManager.clearServerId project_id # force every compile to a new server
# set a timeout # set a timeout
handler = setTimeout (() -> handler = setTimeout (() ->
sendRes 500, "Compiler timed out" sendRes 500, "Compiler timed out"
@ -262,7 +265,7 @@ module.exports = class Router
# use a valid user id for testing # use a valid user id for testing
test_user_id = "123456789012345678901234" test_user_id = "123456789012345678901234"
# run the compile # run the compile
CompileManager.compile req.params.Project_id, test_user_id, {}, (error, status) -> CompileManager.compile project_id, test_user_id, {}, (error, status) ->
clearTimeout handler if handler? clearTimeout handler if handler?
if error? if error?
sendRes 500, "Compiler returned error #{error.message}" sendRes 500, "Compiler returned error #{error.message}"