diff --git a/config/environments/development.js.example b/config/environments/development.js.example index 48d03592..f09a3808 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -107,6 +107,9 @@ var config = { // Milliseconds since last access before renderer cache item expires cache_ttl: 60000, statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status + mvt: { + usePgSQL: false + }, mapnik: { // The size of the pool of internal mapnik backend // This pool size is per mapnik renderer created in Windshaft's RendererFactory diff --git a/config/environments/production.js.example b/config/environments/production.js.example index ba7fec6f..1dd80212 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -101,6 +101,9 @@ var config = { // Milliseconds since last access before renderer cache item expires cache_ttl: 60000, statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status + mvt: { + usePgSQL: false + }, mapnik: { // The size of the pool of internal mapnik backend // This pool size is per mapnik renderer created in Windshaft's RendererFactory diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index 1792779c..7dd9f5b0 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -101,6 +101,9 @@ var config = { // Milliseconds since last access before renderer cache item expires cache_ttl: 60000, statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status + mvt: { + usePgSQL: false + }, mapnik: { // The size of the pool of internal mapnik backend // This pool size is per mapnik renderer created in Windshaft's RendererFactory diff --git a/config/environments/test.js.example b/config/environments/test.js.example index 374467c0..b266c923 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -100,6 +100,9 @@ var config = { // Milliseconds since last access before renderer cache item expires cache_ttl: 60000, statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status + mvt: { + usePgSQL: false + }, mapnik: { // The size of the pool of internal mapnik backend // This pool size is per mapnik renderer created in Windshaft's RendererFactory diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js index 350e52a0..723289ba 100644 --- a/lib/cartodb/server.js +++ b/lib/cartodb/server.js @@ -154,7 +154,8 @@ module.exports = function(serverOptions) { grainstore: serverOptions.grainstore, mapnik: serverOptions.renderer.mapnik }, - http: serverOptions.renderer.http + http: serverOptions.renderer.http, + mvt: serverOptions.renderer.mvt }); // initialize render cache diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index 6d8575a7..25e60c2f 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -81,6 +81,7 @@ module.exports = { statsInterval: rendererConfig.statsInterval }, renderer: { + mvt: rendererConfig.mvt, mapnik: _.defaults(rendererConfig.mapnik, { geojson: { dbPoolParams: {