From 5c0b7487f73d58ad9ab356685b373fb2825d132e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Wed, 1 Aug 2018 11:25:55 +0200 Subject: [PATCH] using calbacks instead of step --- lib/cartodb/backends/template_maps.js | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/cartodb/backends/template_maps.js b/lib/cartodb/backends/template_maps.js index 8d4008e6..19c11efe 100644 --- a/lib/cartodb/backends/template_maps.js +++ b/lib/cartodb/backends/template_maps.js @@ -73,21 +73,17 @@ TemplateMaps.prototype._redisCmd = function(redisFunc, redisArgs, callback) { var that = this; var db = that.db_signatures; - function getRedisClient() { - that.redis_pool.acquire(db, this); - }, - function executeQuery(err, data) { + that.redis_pool.acquire(db, (err, data) => { assert.ifError(err); redisClient = data; - redisArgs.push(this); + redisArgs.push((err, data) => { + if ( ! _.isUndefined(redisClient) ) { + that.redis_pool.release(db, redisClient); + } + callback(err, data); + }); redisClient[redisFunc.toUpperCase()].apply(redisClient, redisArgs); - }, - function releaseRedisClient(err, data) { - if ( ! _.isUndefined(redisClient) ) { - that.redis_pool.release(db, redisClient); - } - callback(err, data); - } + }); }; var _reValidNameIdentifier = /^[a-z0-9][0-9a-z_\-]*$/i;