From 847ab96a48e8e7bfd09aa60416bb611a75e86859 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Fri, 10 Jul 2015 12:30:52 +0200 Subject: [PATCH] RendererFactory changes for new signature --- lib/cartodb/server.js | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js index 007b2135..2feacf6f 100644 --- a/lib/cartodb/server.js +++ b/lib/cartodb/server.js @@ -150,34 +150,9 @@ module.exports = function(serverOptions) { // initialize render cache var rendererCacheOpts = _.defaults(serverOptions.renderCache || {}, { ttl: 60000, // 60 seconds TTL by default - statsInterval: 60000, // reports stats every milliseconds defined here - beforeRendererCreate: function(req, callback) { - var rendererOptions = {}; - - step( - function getLimits(err) { - assert.ifError(err); - metadataBackend.getTilerRenderLimit(req.context.user, this); - }, - function handleTilerLimits(err, renderLimit) { - assert.ifError(err); - rendererOptions.limits = { - cacheOnTimeout: serverOptions.renderer.mapnik.limits.cacheOnTimeout || false, - render: renderLimit || serverOptions.renderer.mapnik.limits.render || 0 - }; - return null; - }, - function finish(err) { - if (err) { - return callback(err); - } - - return callback(null, rendererOptions); - } - ); - } + statsInterval: 60000 // reports stats every milliseconds defined here }); - var rendererCache = new windshaft.cache.RendererCache(rendererCacheOpts, mapStore, rendererFactory); + var rendererCache = new windshaft.cache.RendererCache(rendererFactory, rendererCacheOpts); var attributesBackend = new windshaft.backend.Attributes(rendererCache, mapStore); var previewBackend = new windshaft.backend.Preview(rendererCache);