Merge branch 'master' into eslint

2019-11-13 19:00:50 +01:00
parent 734c373f3d ccd01e6da5
commit 2c8a030ecb
21 changed files with 333 additions and 133 deletions
@@ -85,9 +85,13 @@ module.exports = class ApiRouter {
        const metadataBackend = cartodbRedis({ pool: redisPool });
        const pgConnection = new PgConnection(metadataBackend);

+        const windshaftLogger = environmentOptions.log_windshaft && global.log4js ?
+                                global.log4js.getLogger('[windshaft]') :
+                                null;
        const mapStore = new windshaft.storage.MapStore({
            pool: redisPool,
-            expire_time: serverOptions.grainstore.default_layergroup_ttl
+            expire_time: serverOptions.grainstore.default_layergroup_ttl,
+            logger: windshaftLogger
        });

        const rendererFactory = createRendererFactory({ redisPool, serverOptions, environmentOptions });