diff --git a/NEWS.md b/NEWS.md index d48a89cb..af75e5df 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,16 @@ -1.14.1 -- 2014-mm-dd +1.15.1 -- 2014-mm-dd -------------------- +1.15.0 -- 2014-08-13 +-------------------- +Enhancements: + - Upgrades dependencies: + - redis-mpool + - cartodb-redis + - windshaft + - Specifies name in the redis pool + - Slow pool configuration in example configurations + 1.14.0 -- 2014-08-07 -------------------- diff --git a/config/environments/development.js.example b/config/environments/development.js.example index 5a432914..59c9f6aa 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -103,7 +103,11 @@ var config = { // kept open by the server. The default is 50. max: 50, idleTimeoutMillis: 1, // idle time before dropping connection - reapIntervalMillis: 1 // time between cleanups + reapIntervalMillis: 1, // time between cleanups + slowPool: { + log: true, // whether a slow acquire must be logged or not + elapsedThreshold: 25 // the threshold to determine an slow acquire must be reported or not + } } ,sqlapi: { protocol: 'http', diff --git a/config/environments/production.js.example b/config/environments/production.js.example index 08532ac1..851671da 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -97,7 +97,11 @@ var config = { // kept open by the server. The default is 50. max: 50, idleTimeoutMillis: 30000, // idle time before dropping connection - reapIntervalMillis: 1000 // time between cleanups + reapIntervalMillis: 1000, // time between cleanups + slowPool: { + log: true, // whether a slow acquire must be logged or not + elapsedThreshold: 25 // the threshold to determine an slow acquire must be reported or not + } } ,sqlapi: { protocol: 'https', diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index b30bca97..1084f1e6 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -97,7 +97,11 @@ var config = { // kept open by the server. The default is 50. max: 50, idleTimeoutMillis: 30000, // idle time before dropping connection - reapIntervalMillis: 1000 // time between cleanups + reapIntervalMillis: 1000, // time between cleanups + slowPool: { + log: true, // whether a slow acquire must be logged or not + elapsedThreshold: 25 // the threshold to determine an slow acquire must be reported or not + } } ,sqlapi: { protocol: 'https', diff --git a/config/environments/test.js.example b/config/environments/test.js.example index e313cf19..2937f285 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -97,7 +97,11 @@ var config = { // kept open by the server. The default is 50. max: 50, idleTimeoutMillis: 1, // idle time before dropping connection - reapIntervalMillis: 1 // time between cleanups + reapIntervalMillis: 1, // time between cleanups + slowPool: { + log: true, // whether a slow acquire must be logged or not + elapsedThreshold: 25 // the threshold to determine an slow acquire must be reported or not + } } ,sqlapi: { protocol: 'http', diff --git a/lib/cartodb/cartodb_windshaft.js b/lib/cartodb/cartodb_windshaft.js index eea30870..a77a56a3 100644 --- a/lib/cartodb/cartodb_windshaft.js +++ b/lib/cartodb/cartodb_windshaft.js @@ -2,7 +2,7 @@ var _ = require('underscore') , Step = require('step') , Windshaft = require('windshaft') - , redisPool = require('redis-mpool')(global.environment.redis) + , redisPool = require('redis-mpool')(_.extend(global.environment.redis, {name: 'windshaft:cartodb'})) // TODO: instanciate cartoData with redisPool , cartoData = require('cartodb-redis')(global.environment.redis) , SignedMaps = require('./signed_maps.js') diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 84d5c5aa..5ac8376c 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "1.14.1", + "version": "1.15.1", "dependencies": { "node-varnish": { "version": "0.3.0", @@ -10,12 +10,12 @@ "version": "1.3.3" }, "windshaft": { - "version": "0.23.0", - "from": "https://github.com/CartoDB/Windshaft/tarball/0.23.0", + "version": "0.24.0", + "from": "https://github.com/CartoDB/Windshaft/tarball/0.24.0", "dependencies": { "grainstore": { - "version": "0.19.0", - "from": "git://github.com/CartoDB/grainstore.git#0.19.0", + "version": "0.20.0", + "from": "git://github.com/CartoDB/grainstore.git#0.20.0", "dependencies": { "carto": { "version": "0.9.5-cdb2", @@ -934,8 +934,8 @@ "version": "2.9.202" }, "cartodb-redis": { - "version": "0.5.0", - "from": "git://github.com/CartoDB/node-cartodb-redis.git#0.5.0" + "version": "0.9.0", + "from": "git://github.com/CartoDB/node-cartodb-redis.git#0.9.0" }, "cartodb-psql": { "version": "0.3.1", @@ -961,8 +961,8 @@ } }, "redis-mpool": { - "version": "0.0.4", - "from": "http://github.com/CartoDB/node-redis-mpool/tarball/0.0.4", + "version": "0.1.0", + "from": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0", "dependencies": { "generic-pool": { "version": "2.0.4" diff --git a/package.json b/package.json index 645ae643..eab16fd6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "1.14.1", + "version": "1.15.1", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" @@ -24,12 +24,12 @@ "dependencies": { "node-varnish": "http://github.com/Vizzuality/node-varnish/tarball/0.3.0", "underscore" : "~1.3.3", - "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.23.0", - "step": "0.0.x", + "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.24.0", + "step": "~0.0.5", "request": "2.9.202", - "cartodb-redis": "git://github.com/CartoDB/node-cartodb-redis.git#0.5.0", + "cartodb-redis": "git://github.com/CartoDB/node-cartodb-redis.git#0.9.0", "cartodb-psql": "git://github.com/CartoDB/node-cartodb-psql.git#0.3.1", - "redis-mpool": "http://github.com/CartoDB/node-redis-mpool/tarball/0.0.4", + "redis-mpool": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0", "mapnik": "http://github.com/Vizzuality/node-mapnik/tarball/0.7.26-cdb1", "lzma": "~1.2.3", "log4js": "~0.6.10",