diff --git a/NEWS.md b/NEWS.md index 439acd10..0e0b36a8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,8 +1,9 @@ -1.19.1 -- 2014-mm-dd +1.20.0 -- 2014-mm-dd -------------------- New features: - Report to statsd the status of redis pools + - Upgrades Windshaft to start reporting redis/renderers/mapnik pool metrics Enhancements: - Share one redis-mpool across the application diff --git a/config/environments/development.js.example b/config/environments/development.js.example index fafb283f..d36a6ba7 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -86,7 +86,8 @@ var config = { // Milliseconds since last access before renderer cache item expires cache_ttl: 60000, metatile: 4, - bufferSize: 64 + bufferSize: 64, + statsInterval: 5000 // milliseconds between each report to statsd about number of renderers and mapnik pool status } ,millstone: { // Needs to be writable by server user diff --git a/config/environments/production.js.example b/config/environments/production.js.example index c4fb2707..7449144d 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -80,7 +80,8 @@ var config = { // Milliseconds since last access before renderer cache item expires cache_ttl: 60000, metatile: 4, - bufferSize: 64 + bufferSize: 64, + statsInterval: 5000 // milliseconds between each report to statsd about number of renderers and mapnik pool status } ,millstone: { // Needs to be writable by server user diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index d0e93555..920388d4 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -80,7 +80,8 @@ var config = { // Milliseconds since last access before renderer cache item expires cache_ttl: 60000, metatile: 4, - bufferSize: 64 + bufferSize: 64, + statsInterval: 5000 // milliseconds between each report to statsd about number of renderers and mapnik pool status } ,millstone: { // Needs to be writable by server user diff --git a/config/environments/test.js.example b/config/environments/test.js.example index b2ea2736..68b8f323 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -80,7 +80,8 @@ var config = { // Milliseconds since last access before renderer cache item expires cache_ttl: 60000, metatile: 4, - bufferSize: 64 + bufferSize: 64, + statsInterval: 5000 // milliseconds between each report to statsd about number of renderers and mapnik pool status } ,millstone: { // Needs to be writable by server user diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index c8c9dbcc..4ac405dd 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -22,9 +22,10 @@ module.exports = function(redisPool) { queryTablesApi = new QueryTablesApi(); var rendererConfig = _.defaults(global.environment.renderer || {}, { - cache_ttl: 60000, // milliseconds - metatile: 4, - bufferSize: 64 + cache_ttl: 60000, // milliseconds + metatile: 4, + bufferSize: 64, + statsInterval: 60000 }); var me = { @@ -60,7 +61,8 @@ module.exports = function(redisPool) { }, statsd: global.environment.statsd, renderCache: { - ttl: rendererConfig.cache_ttl + ttl: rendererConfig.cache_ttl, + statsInterval: rendererConfig.statsInterval }, redis: global.environment.redis, enable_cors: global.environment.enable_cors, diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index fc38898e..d19f2142 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "1.19.1", + "version": "1.20.0", "dependencies": { "cartodb-psql": { "version": "0.4.0", @@ -167,9 +167,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "0.29.0", - "from": "https://github.com/CartoDB/Windshaft/tarball/0.29.0", - "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.29.0", + "version": "0.30.0", + "from": "https://github.com/CartoDB/Windshaft/tarball/0.30.0", + "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.30.0", "dependencies": { "chronograph": { "version": "0.1.0", diff --git a/package.json b/package.json index 6f77fcd6..7a8cea9d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "1.19.1", + "version": "1.20.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" @@ -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.29.0", + "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.30.0", "step": "~0.0.5", "request": "~2.9.203", "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",