From d20286febd83d5281a474aafc299f14c008429ea Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 12 Mar 2014 21:56:58 +0000 Subject: [PATCH] stop response sending twice if compile takes a long time when testing --- services/web/app/coffee/router.coffee | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index 46d702f13f..764ae8afd6 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -34,6 +34,7 @@ ProjectDownloadsController = require "./Features/Downloads/ProjectDownloadsContr FileStoreController = require("./Features/FileStore/FileStoreController") TrackChangesController = require("./Features/TrackChanges/TrackChangesController") logger = require("logger-sharelatex") +_ = require("underscore") httpAuth = require('express').basicAuth (user, pass)-> isValid = Settings.httpAuthUsers[user] == pass @@ -190,15 +191,13 @@ module.exports = class Router app.get '/health_check', HealthCheckController.check app.get "/status/compiler/:Project_id", SecutiryManager.requestCanAccessProject, (req, res) -> - success = false + sendRes = _.once (statusCode, message)-> + res.writeHead statusCode + res.end message CompileManager.compile req.params.Project_id, "test-compile", {}, () -> - success = true - res.writeHead 200 - res.end "Compiler returned in less than 10 seconds" + sendRes 200, "Compiler returned in less than 10 seconds" setTimeout (() -> - if !success - res.writeHead 500 - res.end "Compiler timed out" + sendRes 500, "Compiler timed out" ), 10000 req.session.destroy()