From 13fdfc602e06d65a35b556c1ab68d52031f179cd Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 13 Aug 2014 15:10:58 +0200 Subject: [PATCH 1/3] Upgrades dependencies --- NEWS.md | 5 +++++ npm-shrinkwrap.json | 16 ++++++++-------- package.json | 8 ++++---- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/NEWS.md b/NEWS.md index d48a89cb..ab445398 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,10 @@ 1.14.1 -- 2014-mm-dd -------------------- +Enhancements: + - Upgrades dependencies: + - redis-mpool + - cartodb-redis + - windshaft 1.14.0 -- 2014-08-07 -------------------- diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 7d543b85..08091f72 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -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,12 +934,12 @@ "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" }, "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 d0818316..debfc904 100644 --- a/package.json +++ b/package.json @@ -24,11 +24,11 @@ "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", - "redis-mpool": "http://github.com/CartoDB/node-redis-mpool/tarball/0.0.4", + "cartodb-redis": "git://github.com/CartoDB/node-cartodb-redis.git#0.9.0", + "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", From 40acf533ae2b7752ca4697037c497105251f3f74 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 13 Aug 2014 15:12:46 +0200 Subject: [PATCH 2/3] Specifies name in the redis pool --- NEWS.md | 1 + lib/cartodb/cartodb_windshaft.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index ab445398..83d47dac 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,6 +5,7 @@ Enhancements: - redis-mpool - cartodb-redis - windshaft + - Specifies name in the redis pool 1.14.0 -- 2014-08-07 -------------------- 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') From 713e394e7bc13aa983e7317a7cbad53c494f6dea Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 13 Aug 2014 15:15:30 +0200 Subject: [PATCH 3/3] Slow pool configuration in example configurations --- NEWS.md | 1 + config/environments/development.js.example | 6 +++++- config/environments/production.js.example | 6 +++++- config/environments/staging.js.example | 6 +++++- config/environments/test.js.example | 6 +++++- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/NEWS.md b/NEWS.md index 83d47dac..e86f9193 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,6 +6,7 @@ Enhancements: - 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',