From 86b9e4b53a349a808755b155b5050743db9127c1 Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Thu, 5 Dec 2019 13:51:27 +0000 Subject: [PATCH] Rename request -> s3Request to prevent overwriting main import --- services/filestore/app/coffee/S3PersistorManager.coffee | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/filestore/app/coffee/S3PersistorManager.coffee b/services/filestore/app/coffee/S3PersistorManager.coffee index ca74bdb013..4c33fd84d2 100644 --- a/services/filestore/app/coffee/S3PersistorManager.coffee +++ b/services/filestore/app/coffee/S3PersistorManager.coffee @@ -95,9 +95,9 @@ module.exports = } if opts.start? and opts.end? s3Params['Range'] = "bytes=#{opts.start}-#{opts.end}" - request = s3.getObject(s3Params) + s3Request = s3.getObject(s3Params) - request.on 'httpHeaders', (statusCode, headers, response, statusMessage) => + s3Request.on 'httpHeaders', (statusCode, headers, response, statusMessage) => if statusCode in [403, 404] # S3 returns a 403 instead of a 404 when the user doesn't have # permission to list the bucket contents. @@ -109,11 +109,11 @@ module.exports = stream = response.httpResponse.createUnbufferedStream() callback(null, stream) - request.on 'error', (err) => + s3Request.on 'error', (err) => logger.err({ err: err, bucketName: bucketName, key: key }, "error getting file stream from s3") callback(err) - request.send() + s3Request.send() getFileSize: (bucketName, key, callback) -> logger.log({ bucketName: bucketName, key: key }, "getting file size from S3")