From 8b07156a2dc3317af1716df9d5dbaaaa9e14f20d Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Fri, 30 Jan 2015 16:51:09 +0100 Subject: [PATCH] Make templateMaps available in cartodb windshaft --- lib/cartodb/cartodb_windshaft.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/cartodb/cartodb_windshaft.js b/lib/cartodb/cartodb_windshaft.js index c7e63266..a1dbe824 100644 --- a/lib/cartodb/cartodb_windshaft.js +++ b/lib/cartodb/cartodb_windshaft.js @@ -23,6 +23,8 @@ var CartodbWindshaft = function(serverOptions) { var cartoData = require('cartodb-redis')({pool: redisPool}); + var templateMaps = serverOptions.templateMaps; + if(serverOptions.cache_enabled) { console.log("cache invalidation enabled, varnish on ", serverOptions.varnish_host, ' ', serverOptions.varnish_port); Cache.init(serverOptions.varnish_host, serverOptions.varnish_port, serverOptions.varnish_secret); @@ -150,13 +152,7 @@ var CartodbWindshaft = function(serverOptions) { var TemplateMapsController = require('./controllers/template_maps'), templateMapsController = new TemplateMapsController( - ws, - serverOptions, - serverOptions.templateMaps, - cartoData, - template_baseurl, - surrogateKeysCache, - NamedMapsCacheEntry + ws, serverOptions, templateMaps, cartoData, template_baseurl, surrogateKeysCache, NamedMapsCacheEntry ); templateMapsController.register(ws);