From 56635d2221a10c533404502b922abeca0969360c Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 12 Nov 2015 12:43:40 +0000 Subject: [PATCH] set timeout for sixpack server dynamically, needs to be longer for local dev --- services/web/app/coffee/infrastructure/Sixpack.coffee | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/web/app/coffee/infrastructure/Sixpack.coffee b/services/web/app/coffee/infrastructure/Sixpack.coffee index d4d4239b96..769300c397 100644 --- a/services/web/app/coffee/infrastructure/Sixpack.coffee +++ b/services/web/app/coffee/infrastructure/Sixpack.coffee @@ -2,6 +2,11 @@ settings = require("settings-sharelatex") request = require("request") logger = require("logger-sharelatex") + + +timeout = if process.env.NODE_ENV == "production" then 500 else 5000 +logger.log "using timeout of #{timeout}ms for sixpack server calls" + generate_client_id = -> # from http://stackoverflow.com/questions/105034 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace /[xy]/g, (c) -> @@ -29,7 +34,7 @@ _request = (uri, params, callback)-> opts = uri:_request_uri(uri, params) json:true - timeout:1000 + timeout:timeout request.get opts, (err, res, body)-> callback err, body