metadata backend

lib/cartodb/server.js

@@ -2,6 +2,7 @@ var assert = require('assert');
 
 var express = require('express');
 var RedisPool = require('redis-mpool');
+var cartodbRedis = require('cartodb-redis');
 var _ = require('underscore');
 var step = require('step');
 
@@ -65,9 +66,8 @@ module.exports = function(serverOptions) {
         global.statsClient.gauge(keyPrefix + 'waiting', status.waiting);
     });
 
-    var cartoData = require('cartodb-redis')({pool: redisPool});
-
-    var pgConnection = new PgConnection(cartoData);
+    var metadataBackend = cartodbRedis({pool: redisPool});
+    var pgConnection = new PgConnection(metadataBackend);
     var pgQueryRunner = new PgQueryRunner(pgConnection);
     var queryTablesApi = new QueryTablesApi(pgQueryRunner);
 
@@ -151,7 +151,7 @@ module.exports = function(serverOptions) {
         mapnik: {
             redisPool: redisPool,
             grainstore: serverOptions.grainstore,
-            mapnik: serverOptions.renderer.mapnik || serverOptions.mapnik
+            mapnik: serverOptions.renderer.mapnik
         },
         http: serverOptions.renderer.http
     });
@@ -168,7 +168,7 @@ module.exports = function(serverOptions) {
             step(
                 function getLimits(err) {
                     assert.ifError(err);
-                    cartoData.getTilerRenderLimit(user, this);
+                    metadataBackend.getTilerRenderLimit(user, this);
                 },
                 function handleTilerLimits(err, renderLimit) {
                     assert.ifError(err);
@@ -249,7 +249,7 @@ module.exports = function(serverOptions) {
             // Don't wait for the mapview count increment to
             // take place before proceeding. Error will be logged
             // asyncronously
-            cartoData.incMapviewCount(username, mapconfig.stat_tag, function(err) {
+            metadataBackend.incMapviewCount(username, mapconfig.stat_tag, function(err) {
                 if (req.profiler) {
                     req.profiler.done('incMapviewCount');
                 }
@@ -314,7 +314,7 @@ module.exports = function(serverOptions) {
             app,
             serverOptions,
             templateMaps,
-            cartoData,
+            metadataBackend,
             mapBackend,
             template_baseurl,
             surrogateKeysCache,
@@ -839,7 +839,7 @@ module.exports = function(serverOptions) {
         var user = cdbRequest.userByReq(req);
         step(
             function (){
-                cartoData.getUserMapKey(user, this);
+                metadataBackend.getUserMapKey(user, this);
             },
             function checkApiKey(err, val){
                 assert.ifError(err);