From 59ace9d5c542459d60fbb336dfd50ebe192be126 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Mon, 26 Jun 2017 16:36:05 +0100 Subject: [PATCH] avoid long lines in timeout check --- services/document-updater/app/coffee/RedisManager.coffee | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/services/document-updater/app/coffee/RedisManager.coffee b/services/document-updater/app/coffee/RedisManager.coffee index edf56c3d50..be5018297d 100644 --- a/services/document-updater/app/coffee/RedisManager.coffee +++ b/services/document-updater/app/coffee/RedisManager.coffee @@ -104,7 +104,9 @@ module.exports = RedisManager = # check if request took too long and bail out. only do this for # get, because it is the first call in each update, so if this # passes we'll assume others have a reasonable chance to succeed. - return callback(new Error("redis getDoc exceeded timeout")) if timeSpan > MAX_REDIS_REQUEST_LENGTH + if timeSpan > MAX_REDIS_REQUEST_LENGTH + error = new Error("redis getDoc exceeded timeout") + return callback(error) # check sha1 hash value if present if docLines? and storedHash? computedHash = RedisManager._computeHash(docLines) @@ -170,7 +172,9 @@ module.exports = RedisManager = catch e return callback(e) timeSpan = timer.done() - return callback(new Error("redis getPreviousDocOps exceeded timeout")) if timeSpan > MAX_REDIS_REQUEST_LENGTH + if timeSpan > MAX_REDIS_REQUEST_LENGTH + error = new Error("redis getPreviousDocOps exceeded timeout") + return callback(error) callback null, ops DOC_OPS_TTL: 60 * minutes