Require carto_data only after setting the global env (closes #28)

This commit is contained in:
Sandro Santilli
2012-07-10 09:49:56 +02:00
parent 895877be8b
commit da593ded74
+4 -1
View File
@@ -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');