cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1141 from CartoDB/fix-undefinded-layergroupTTL

Browse Source 
Fix undefinded layergroup ttl
This commit is contained in:
Daniel G. Aubert 2019-11-14 14:50:32 +01:00 committed by GitHub
commit 3c301ce742
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/api/api-router.js
View File

@ -86,6 +86,7 @@ module.exports = class ApiRouter {
const windshaftLogger = environmentOptions.log_windshaft && global.log4js ? const windshaftLogger = environmentOptions.log_windshaft && global.log4js ?
global.log4js.getLogger('[windshaft]') : global.log4js.getLogger('[windshaft]') :
null; null;
const mapStore = new windshaft.storage.MapStore({ const mapStore = new windshaft.storage.MapStore({
pool: redisPool, pool: redisPool,
expire_time: serverOptions.grainstore.default_layergroup_ttl, expire_time: serverOptions.grainstore.default_layergroup_ttl,

3
test/acceptance/ported/support/ported-server-options.js
View File

@ -16,7 +16,8 @@ module.exports = _.extend({}, serverOptions, {
}, },
cachedir: global.environment.millstone.cache_basedir, cachedir: global.environment.millstone.cache_basedir,
mapnik_version: global.environment.mapnik_version || mapnik.versions.mapnik, mapnik_version: global.environment.mapnik_version || mapnik.versions.mapnik,
gc_prob: 0 // run the garbage collector at each invocation gc_prob: 0, // run the garbage collector at each invocation
default_layergroup_ttl: global.environment.mapConfigTTL || 7200
}, },
renderer: { renderer: {
mapnik: { mapnik: {