From eba7eb4e2811a6214f70c90db8071f97f0e97042 Mon Sep 17 00:00:00 2001 From: Simon Tokumine Date: Fri, 7 Oct 2011 17:28:07 +0100 Subject: [PATCH] quick tidy --- app.js | 6 +++--- cluster.js | 8 +++----- package.json | 53 ++++++++++++++++++++++++++++------------------------ 3 files changed, 35 insertions(+), 32 deletions(-) diff --git a/app.js b/app.js index 22d9cd1b..21de716b 100755 --- a/app.js +++ b/app.js @@ -12,7 +12,7 @@ var _ = require('underscore'); // sanity check arguments -var ENV = process.argv[2] +var ENV = process.argv[2]; if (ENV != 'development' && ENV != 'production') { console.error("\n./app [environment]"); console.error("environments: [development, test, production]"); @@ -20,8 +20,8 @@ if (ENV != 'development' && ENV != 'production') { } // set Node.js app settings and boot -global.settings = require(__dirname + '/config/settings') -var env = require(__dirname + '/config/environments/' + ENV) +global.settings = require(__dirname + '/config/settings'); +var env = require(__dirname + '/config/environments/' + ENV); _.extend(global.settings, env); // kick off controller diff --git a/cluster.js b/cluster.js index e5b3dbbd..a41c8299 100755 --- a/cluster.js +++ b/cluster.js @@ -13,7 +13,7 @@ var _ = require('underscore'); var cluster = require('cluster'); // sanity check arguments -var ENV = process.argv[2] +var ENV = process.argv[2]; if (ENV != 'development' && ENV != 'production' && ENV != 'test' && ENV != 'staging') { console.error("\n./cluster [environment]"); console.error("environments: [development, test, production, staging]"); @@ -21,13 +21,11 @@ if (ENV != 'development' && ENV != 'production' && ENV != 'test' && ENV != 'stag } // set Node.js app settings and boot -global.settings = require(__dirname + '/config/settings') -var env = require(__dirname + '/config/environments/' + ENV) +global.settings = require(__dirname + '/config/settings'); +var env = require(__dirname + '/config/environments/' + ENV); _.extend(global.settings, env); cluster('./app/controllers/app') -// .set('workers', 2) -// .set('socket path', '/tmp') .use(cluster.logger('logs')) .use(cluster.stats()) .use(cluster.pidfiles('pids')) diff --git a/package.json b/package.json index f7fe2d1c..d3f6cb27 100644 --- a/package.json +++ b/package.json @@ -1,26 +1,31 @@ { - "private": true, - "name": "cartodb_api", - "description": "high speed SQL api for cartodb", - "version": "0.0.1", - "dependencies": { - "cluster": "0.6.4", - "express": "2.4.3", - "underscore" : "1.1.x", - "underscore.string": "1.1.5", - "pg": "0.5.6", - "generic-pool": "1.0.x", - "redis": "0.6.1", - "step": "0.0.x", - "oauth-client": "0.2.0", - "libxmljs": "0.4.2" - }, - "devDependencies": { - "expresso": "0.8.x" - }, - "scripts": { - "unit": "expresso ./test/unit/* | sh", - "acceptance": "expresso ./test/acceptance/* | sh" - }, - "engines": { "node": ">= 0.4.1 < 0.5.0" } + "private": true, + "name": "cartodb_api", + "description": "high speed SQL api for cartodb", + "version": "0.0.1", + "author": { + "name": "Simon Tokumine, Vizzuality", + "url": "http://vizzuality.com", + "email": "simon@vizzuality.com" + }, + "dependencies": { + "cluster": "0.6.4", + "express": "2.4.3", + "underscore" : "1.1.x", + "underscore.string": "1.1.5", + "pg": "0.5.6", + "generic-pool": "1.0.x", + "redis": "0.6.1", + "step": "0.0.x", + "oauth-client": "0.2.0", + "libxmljs": "0.4.2" + }, + "devDependencies": { + "expresso": "0.8.x" + }, + "scripts": { + "unit": "expresso ./test/unit/* | sh", + "acceptance": "expresso ./test/acceptance/* | sh" + }, + "engines": { "node": ">= 0.4.1 < 0.5.0" } }