From da593ded74123966d6667abc09aef5ba1b99caba Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 10 Jul 2012 09:49:56 +0200 Subject: [PATCH] Require carto_data only after setting the global env (closes #28) --- app.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app.js b/app.js index 5c996f0d..4bd8a6b4 100755 --- a/app.js +++ b/app.js @@ -18,7 +18,6 @@ if (ENV != 'development' && ENV != 'production'){ var _ = require('underscore') , Step = require('step') - , cartoData = require('./lib/cartodb/carto_data') , CartodbWindshaft = require('./lib/cartodb/cartodb_windshaft'); // set environment specific variables @@ -26,6 +25,10 @@ global.settings = require(__dirname + '/config/settings'); global.environment = require(__dirname + '/config/environments/' + ENV); _.extend(global.settings, global.environment); +// Include cart_data.js only _after_ the "global" variable is set +// See https://github.com/Vizzuality/Windshaft-cartodb/issues/28 +var cartoData = require('./lib/cartodb/carto_data'); + var Windshaft = require('windshaft'); var serverOptions = require('./lib/cartodb/server_options');