From 09224007a7f829dda77cc65e657f67ae919c02b7 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 7 May 2014 09:06:05 +0100 Subject: [PATCH] on domain error wait 3 seconds to send 500 to allow for other cleanup. Also check inside function if the res has finished. #confused --- services/filestore/app.coffee | 6 ++++-- services/filestore/app/coffee/FileController.coffee | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/services/filestore/app.coffee b/services/filestore/app.coffee index 027ec11119..0e405d6e34 100644 --- a/services/filestore/app.coffee +++ b/services/filestore/app.coffee @@ -35,8 +35,10 @@ app.use (req, res, next) -> requestDomain.add req requestDomain.add res requestDomain.on "error", (err)-> - if !res.finished - res.send(500) + setTimeout(-> + if !res.finished + res.send(500) + , 3000) logger = require('logger-sharelatex') req = body:req.body diff --git a/services/filestore/app/coffee/FileController.coffee b/services/filestore/app/coffee/FileController.coffee index d1221f7b32..2beaef8a96 100644 --- a/services/filestore/app/coffee/FileController.coffee +++ b/services/filestore/app/coffee/FileController.coffee @@ -15,7 +15,8 @@ module.exports = FileHandler.getFile bucket, key, {format:format,style:style}, (err, fileStream)-> if err? logger.err err:err, key:key, bucket:bucket, format:format, style:style, "problem getting file" - res?.send? 500 + if !res.finished and res?.send? + res.send 500 else if req.query.cacheWarm logger.log key:key, bucket:bucket, format:format, style:style, "request is only for cache warm so not sending stream" res.send 200