diff --git a/NEWS.md b/NEWS.md index 3e3d48ac..d4448129 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,9 @@ 1.19.1 -- 2014-mm-dd -------------------- +Enhancements: + - Share one redis-mpool across the application + 1.19.0 -- 2014-10-14 -------------------- @@ -61,7 +64,6 @@ New features: - Starts using mapnik 2.3.x Enhancements: - - Share one redis-mpool across the application - Upgrades windshaft and cartodb-redis - Supports `!scale_denominator!` dynamic param in SQL queries - Metrics revamp: removes and adds some metrics diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index df6f865b..c8c9dbcc 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -16,8 +16,8 @@ if ( _.isUndefined(global.environment.sqlapi.domain) ) { } module.exports = function(redisPool) { - - var cartoData = require('cartodb-redis')({pool: redisPool}), + var redisOpts = redisPool ? {pool: redisPool} : global.environment.redis; + var cartoData = require('cartodb-redis')(redisOpts), lzmaWorker = new LZMA(), queryTablesApi = new QueryTablesApi(); diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index e72b9e40..94fb8c60 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -70,7 +70,8 @@ "dependencies": { "async": { "version": "0.2.10", - "from": "async@~0.2.0" + "from": "async@~0.2.0", + "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz" }, "readable-stream": { "version": "1.0.33-1", @@ -90,7 +91,7 @@ }, "inherits": { "version": "2.0.1", - "from": "inherits@2" + "from": "inherits@~2.0.1" } } } @@ -106,9 +107,9 @@ "resolved": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0" }, "redis-mpool": { - "version": "0.1.0", - "from": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0", - "resolved": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0", + "version": "0.2.0", + "from": "https://github.com/CartoDB/node-redis-mpool/tarball/master", + "resolved": "https://github.com/CartoDB/node-redis-mpool/tarball/master", "dependencies": { "generic-pool": { "version": "2.1.1", @@ -162,12 +163,13 @@ }, "underscore": { "version": "1.6.0", - "from": "underscore@~1.6.0" + "from": "underscore@~1.6.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "0.28.2", - "from": "https://github.com/CartoDB/Windshaft/tarball/0.28.2", - "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.28.2", + "version": "0.28.3", + "from": "https://github.com/CartoDB/Windshaft/tarball/master", + "resolved": "https://github.com/CartoDB/Windshaft/tarball/master", "dependencies": { "chronograph": { "version": "0.1.0", diff --git a/package.json b/package.json index 215d68de..c7222d2e 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.28.2", + "windshaft": "https://github.com/CartoDB/Windshaft/tarball/master", "step": "~0.0.5", "request": "~2.9.203", "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",