From 38e4812b437e87f4e8f26111deb8ccc7864dd0ac Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Wed, 1 Apr 2015 19:35:55 +0200
Subject: [PATCH] Restore previous beforeLayergroupCreate hook behaviour Adds
 new rendercache's beforeRendererCreate hook

---
 lib/cartodb/server_options.js | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index d8398809..92b4db39 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -242,28 +242,19 @@ module.exports = function(redisPool) {
         });
     };
 
-    me.beforeLayergroupCreate = function(req, requestMapConfig, callback) {
+    me.renderCache.beforeRendererCreate = function(req, callback) {
         var user = cdbRequest.userByReq(req);
-        var namedLayersDatasource;
+
+        var rendererOptions = {};
+
         step(
-            function extractNamedLayers() {
-                mapConfigNamedLayersAdapter.getLayers(user, requestMapConfig.layers, pgConnection, this);
-            },
-            function handleNamedLayers(err, layers, datasource) {
-                assert.ifError(err);
-
-                namedLayersDatasource = datasource;
-                requestMapConfig.layers = layers;
-
-                return null;
-            },
             function getLimits(err) {
                 assert.ifError(err);
                 cartoData.getTilerRenderLimit(user, this);
             },
             function handleTilerLimits(err, renderLimit) {
                 assert.ifError(err);
-                req.context.limits = {
+                rendererOptions.limits = {
                     render: renderLimit
                 };
                 return null;
@@ -273,7 +264,20 @@ module.exports = function(redisPool) {
                     return callback(err);
                 }
 
-                return callback(null, requestMapConfig, namedLayersDatasource);
+                return callback(null, rendererOptions);
+            }
+        );
+    };
+
+    me.beforeLayergroupCreate = function(req, requestMapConfig, callback) {
+        mapConfigNamedLayersAdapter.getLayers(cdbRequest.userByReq(req), requestMapConfig.layers, pgConnection,
+            function(err, layers, datasource) {
+                if (err) {
+                    return callback(err);
+                }
+
+                requestMapConfig.layers = layers;
+                return callback(null, requestMapConfig, datasource);
             }
         );
     };