Merge branch 'separate-routers' into improve-folder-structure

lib/cartodb/api/api-router.js

@@ -58,11 +58,11 @@ module.exports = class ApiRouter {
     constructor ({ serverOptions, environmentOptions }) {
         this.serverOptions = serverOptions;
 
-        const redisOptions = Object.assign({}, environmentOptions.redis, {
+        const redisOptions = Object.assign({
             name: 'windshaft-server',
             unwatchOnRelease: false,
             noReadyCheck: true
-        });
+        }, environmentOptions.redis);
 
         const redisPool = new RedisPool(redisOptions);
 
@@ -83,10 +83,11 @@ module.exports = class ApiRouter {
 
         const rendererFactory = createRendererFactory({ redisPool, serverOptions, environmentOptions });
 
-        const rendererCacheOpts = Object.assign({}, serverOptions.renderCache || {}, {
+        const rendererCacheOpts = Object.assign({
             ttl: 60000, // 60 seconds TTL by default
             statsInterval: 60000 // reports stats every milliseconds defined here
-        });
+        }, serverOptions.renderCache || {});
+
         const rendererCache = new windshaft.cache.RendererCache(rendererFactory, rendererCacheOpts);
         const rendererStatsReporter = new RendererStatsReporter(rendererCache, rendererCacheOpts.statsInterval);
         rendererStatsReporter.start();