diff --git a/NEWS.md b/NEWS.md index af0e9abc..b7a68599 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,14 +1,21 @@ # Changelog -## 2.7.1 +## 2.7.2 Released 2015-mm-dd +## 2.7.1 + +Released 2015-07-06 + +Bug fixes: + - redis-mpool `noReadyCheck` and `unwatchOnRelease` options from config and defaulted + ## 2.7.0 -Released 2015-07-03 +Released 2015-07-06 Announcements: - Upgrades windshaft to [0.47.0](https://github.com/CartoDB/Windshaft/releases/tag/0.47.0) diff --git a/config/environments/development.js.example b/config/environments/development.js.example index 497e3421..3fcf78f9 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -176,7 +176,9 @@ var config = { }, emitter: { statusInterval: 5000 // time, in ms, between each status report is emitted from the pool, status is sent to statsd - } + }, + unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161 + noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading } ,varnish: { host: 'localhost', diff --git a/config/environments/production.js.example b/config/environments/production.js.example index df0b75eb..c0a63be9 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -170,7 +170,9 @@ var config = { }, emitter: { statusInterval: 5000 // time, in ms, between each status report is emitted from the pool, status is sent to statsd - } + }, + unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161 + noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading } ,varnish: { host: 'localhost', diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index fd082a9c..69fa635b 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -170,7 +170,9 @@ var config = { }, emitter: { statusInterval: 5000 // time, in ms, between each status report is emitted from the pool, status is sent to statsd - } + }, + unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161 + noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading } ,varnish: { host: 'localhost', diff --git a/config/environments/test.js.example b/config/environments/test.js.example index 94b92807..5597509a 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -172,7 +172,9 @@ var config = { }, emitter: { statusInterval: 5000 // time, in ms, between each status report is emitted from the pool, status is sent to statsd - } + }, + unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161 + noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading } ,varnish: { host: '', diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js index 18328507..ceb825ce 100644 --- a/lib/cartodb/server.js +++ b/lib/cartodb/server.js @@ -57,9 +57,11 @@ module.exports = function(serverOptions) { // Make stats client globally accessible global.statsClient = windshaft.stats.Client.getInstance(serverOptions.statsd); - var redisPool = new RedisPool( - _.extend(serverOptions.redis, { name: 'windshaft:server', unwatchOnRelease: false, noReadyCheck: true}) - ); + var redisPool = new RedisPool(_.defaults(global.environment.redis, { + name: 'windshaft:server', + unwatchOnRelease: false, + noReadyCheck: true + })); redisPool.on('status', function(status) { var keyPrefix = 'windshaft.redis-pool.' + status.name + '.db' + status.db + '.'; diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 476bc9b3..0e1a88c9 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.7.1", + "version": "2.7.2", "dependencies": { "cartodb-psql": { "version": "0.4.0", diff --git a/package.json b/package.json index f4320c7e..07ffc73c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.7.1", + "version": "2.7.2", "description": "A map tile server for CartoDB", "keywords": [ "cartodb"