From 8bb4fbec12c870a49d0c1f872ae8056283552a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Sat, 4 Apr 2020 18:51:22 +0200
Subject: [PATCH] Get the rendererCache's config right and avoid to set the
 NamedMapCacheReporter's interval to 'undefined'

---
 lib/api/api-router.js                          | 4 ++--
 lib/server-options.js                          | 4 ++--
 lib/stats/reporter/named-map-provider-cache.js | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/api/api-router.js b/lib/api/api-router.js
index fe5733c6..7bf7da88 100644
--- a/lib/api/api-router.js
+++ b/lib/api/api-router.js
@@ -94,7 +94,7 @@ module.exports = class ApiRouter {
             logger: windshaftLogger
         });
 
-        const rendererStatsReporter = new RendererStatsReporter(rendererCache, serverOptions.statsInterval);
+        const rendererStatsReporter = new RendererStatsReporter(rendererCache, serverOptions.renderCache.statsInterval);
         rendererStatsReporter.start();
 
         const metadataBackend = cartodbRedis({ pool: redisPool });
@@ -157,7 +157,7 @@ module.exports = class ApiRouter {
 
         const namedMapProviderCacheReporter = new NamedMapProviderCacheReporter({
             namedMapProviderCache,
-            intervalInMilliseconds: serverOptions.statsInterval
+            intervalInMilliseconds: serverOptions.renderCache.statsInterval
         });
         namedMapProviderCacheReporter.start();
 
diff --git a/lib/server-options.js b/lib/server-options.js
index e89c0b1c..c607d98b 100644
--- a/lib/server-options.js
+++ b/lib/server-options.js
@@ -102,8 +102,8 @@ module.exports = {
     },
     statsd: global.environment.statsd,
     renderCache: {
-        ttl: rendererConfig.cache_ttl,
-        statsInterval: rendererConfig.statsInterval
+        ttl: rendererConfig.cache_ttl || 60000,
+        statsInterval: rendererConfig.statsInterval || 60000
     },
     renderer: {
         mvt: Object.assign({ dbPoolParams: global.environment.postgres.pool }, rendererConfig.mvt),
diff --git a/lib/stats/reporter/named-map-provider-cache.js b/lib/stats/reporter/named-map-provider-cache.js
index 81aea87b..0b046fd4 100644
--- a/lib/stats/reporter/named-map-provider-cache.js
+++ b/lib/stats/reporter/named-map-provider-cache.js
@@ -5,7 +5,7 @@ const statKeyTemplate = ctx => `windshaft.named-map-provider-cache.${ctx.metric}
 module.exports = class NamedMapProviderCacheReporter {
     constructor ({ namedMapProviderCache, intervalInMilliseconds } = {}) {
         this.namedMapProviderCache = namedMapProviderCache;
-        this.intervalInMilliseconds = intervalInMilliseconds;
+        this.intervalInMilliseconds = intervalInMilliseconds || 60000;
         this.intervalId = null;
     }