Add configuration flag to enable/disable direct PgSQL MVT

This commit is contained in:
David Manzanares 2017-09-28 12:08:22 +02:00
parent c960535709
commit ad1abb28af
6 changed files with 15 additions and 1 deletions

View File

@ -107,6 +107,9 @@ var config = {
// Milliseconds since last access before renderer cache item expires // Milliseconds since last access before renderer cache item expires
cache_ttl: 60000, cache_ttl: 60000,
statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status
mvt: {
usePgSQL: false
},
mapnik: { mapnik: {
// The size of the pool of internal mapnik backend // The size of the pool of internal mapnik backend
// This pool size is per mapnik renderer created in Windshaft's RendererFactory // This pool size is per mapnik renderer created in Windshaft's RendererFactory

View File

@ -101,6 +101,9 @@ var config = {
// Milliseconds since last access before renderer cache item expires // Milliseconds since last access before renderer cache item expires
cache_ttl: 60000, cache_ttl: 60000,
statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status
mvt: {
usePgSQL: false
},
mapnik: { mapnik: {
// The size of the pool of internal mapnik backend // The size of the pool of internal mapnik backend
// This pool size is per mapnik renderer created in Windshaft's RendererFactory // This pool size is per mapnik renderer created in Windshaft's RendererFactory

View File

@ -101,6 +101,9 @@ var config = {
// Milliseconds since last access before renderer cache item expires // Milliseconds since last access before renderer cache item expires
cache_ttl: 60000, cache_ttl: 60000,
statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status
mvt: {
usePgSQL: false
},
mapnik: { mapnik: {
// The size of the pool of internal mapnik backend // The size of the pool of internal mapnik backend
// This pool size is per mapnik renderer created in Windshaft's RendererFactory // This pool size is per mapnik renderer created in Windshaft's RendererFactory

View File

@ -100,6 +100,9 @@ var config = {
// Milliseconds since last access before renderer cache item expires // Milliseconds since last access before renderer cache item expires
cache_ttl: 60000, cache_ttl: 60000,
statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status
mvt: {
usePgSQL: false
},
mapnik: { mapnik: {
// The size of the pool of internal mapnik backend // The size of the pool of internal mapnik backend
// This pool size is per mapnik renderer created in Windshaft's RendererFactory // This pool size is per mapnik renderer created in Windshaft's RendererFactory

View File

@ -154,7 +154,8 @@ module.exports = function(serverOptions) {
grainstore: serverOptions.grainstore, grainstore: serverOptions.grainstore,
mapnik: serverOptions.renderer.mapnik mapnik: serverOptions.renderer.mapnik
}, },
http: serverOptions.renderer.http http: serverOptions.renderer.http,
mvt: serverOptions.renderer.mvt
}); });
// initialize render cache // initialize render cache

View File

@ -81,6 +81,7 @@ module.exports = {
statsInterval: rendererConfig.statsInterval statsInterval: rendererConfig.statsInterval
}, },
renderer: { renderer: {
mvt: rendererConfig.mvt,
mapnik: _.defaults(rendererConfig.mapnik, { mapnik: _.defaults(rendererConfig.mapnik, {
geojson: { geojson: {
dbPoolParams: { dbPoolParams: {