cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop support for cluster

Browse Source
This commit is contained in:
Sandro Santilli 2013-10-02 12:45:06 +02:00
parent 82f965fa57
commit 3b69a7f808
4 changed files with 6 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.md
View File

@ -4,6 +4,7 @@
* Fix missing .prj in shapefile export (#110)
* Improve recognition of non-standard field types names by db lookup (#112)
* Upgrade node-pg dependency to 2.6.2
* Drop support for cluster
1.5.4 - 2013-10-01
------------------

43
cluster.js
View File

@ -1,43 +0,0 @@
#!/usr/bin/env node
/*
* SQL API loader
* ===============
*
* node cluster [environment]
*
* environments: [development, test, production]
*
*/
var _ = require('underscore');
var Cluster = require('cluster2');
// sanity check arguments
var ENV = process.argv[2];
if (ENV != 'development' && ENV != 'production' && ENV != 'staging') {
console.error("\n./cluster [environment]");
console.error("environments: [development, test, production, staging]");
process.exit(1);
}
// set Node.js app settings and boot
global.settings = require(__dirname + '/config/settings');
var env = require(__dirname + '/config/environments/' + ENV);
_.extend(global.settings, env);
// kick off controller
var app = require(global.settings.app_root + '/app/controllers/app');
var cluster = new Cluster({
port: global.settings.node_port,
host: global.settings.node_host,
monHost: global.settings.node_host,
monPort: global.settings.node_port+1,
timeout: global.settings.node_socket_timeout
});
cluster.listen(function(cb) {
cb(app);
}, function() {
console.log("CartoDB SQL API listening on " + global.settings.node_host + ':' + global.settings.node_port);
});

266
npm-shrinkwrap.json generated
View File

@ -2,265 +2,6 @@
"name": "cartodb_sql_api",
"version": "1.6.0",
"dependencies": {
"cluster2": {
"version": "0.3.5-cdb02",
"from": "git://github.com/CartoDB/cluster2.git#cdb_production",
"dependencies": {
"ejs": {
"version": "0.8.4"
},
"npm": {
"version": "1.2.22",
"dependencies": {
"semver": {
"version": "1.1.4"
},
"ini": {
"version": "1.1.0"
},
"slide": {
"version": "1.1.4"
},
"abbrev": {
"version": "1.0.4"
},
"graceful-fs": {
"version": "1.2.1"
},
"minimatch": {
"version": "0.2.12",
"dependencies": {
"sigmund": {
"version": "1.0.0"
}
}
},
"nopt": {
"version": "2.1.1"
},
"rimraf": {
"version": "2.1.4"
},
"request": {
"version": "2.21.0",
"dependencies": {
"qs": {
"version": "0.6.4"
},
"json-stringify-safe": {
"version": "4.0.0"
},
"forever-agent": {
"version": "0.5.0"
},
"tunnel-agent": {
"version": "0.3.0"
},
"http-signature": {
"version": "0.9.11",
"dependencies": {
"assert-plus": {
"version": "0.1.2"
},
"asn1": {
"version": "0.1.11"
},
"ctype": {
"version": "0.5.2"
}
}
},
"hawk": {
"version": "0.13.1",
"dependencies": {
"hoek": {
"version": "0.8.5"
},
"boom": {
"version": "0.4.1"
},
"cryptiles": {
"version": "0.2.1"
},
"sntp": {
"version": "0.2.2"
}
}
},
"aws-sign": {
"version": "0.3.0"
},
"oauth-sign": {
"version": "0.3.0"
},
"cookie-jar": {
"version": "0.3.0"
},
"node-uuid": {
"version": "1.4.0"
},
"mime": {
"version": "1.2.9"
},
"form-data": {
"version": "0.0.8",
"dependencies": {
"combined-stream": {
"version": "0.0.4",
"dependencies": {
"delayed-stream": {
"version": "0.0.5"
}
}
},
"async": {
"version": "0.2.8"
}
}
}
}
},
"which": {
"version": "1.0.5"
},
"tar": {
"version": "0.1.17"
},
"fstream": {
"version": "0.1.22"
},
"block-stream": {
"version": "0.0.6"
},
"inherits": {
"version": "1.0.0",
"from": "git://github.com/isaacs/inherits"
},
"mkdirp": {
"version": "0.3.5"
},
"read": {
"version": "1.0.4",
"dependencies": {
"mute-stream": {
"version": "0.0.3"
}
}
},
"lru-cache": {
"version": "2.3.0"
},
"node-gyp": {
"version": "0.9.5"
},
"fstream-npm": {
"version": "0.1.4",
"dependencies": {
"fstream-ignore": {
"version": "0.0.6"
}
}
},
"uid-number": {
"version": "0.0.3"
},
"archy": {
"version": "0.0.2"
},
"chownr": {
"version": "0.0.1"
},
"npmlog": {
"version": "0.0.2"
},
"ansi": {
"version": "0.1.2"
},
"npm-registry-client": {
"version": "0.2.23",
"dependencies": {
"couch-login": {
"version": "0.1.16"
}
}
},
"read-package-json": {
"version": "0.4.1",
"dependencies": {
"normalize-package-data": {
"version": "0.1.6",
"dependencies": {
"github-url-from-git": {
"version": "1.1.1"
}
}
}
}
},
"read-installed": {
"version": "0.1.1"
},
"glob": {
"version": "3.2.1"
},
"init-package-json": {
"version": "0.0.8",
"dependencies": {
"promzard": {
"version": "0.2.0"
}
}
},
"osenv": {
"version": "0.0.3"
},
"lockfile": {
"version": "0.3.2"
},
"retry": {
"version": "0.6.0"
},
"once": {
"version": "1.1.1"
},
"npmconf": {
"version": "0.0.24",
"dependencies": {
"config-chain": {
"version": "1.1.7",
"dependencies": {
"proto-list": {
"version": "1.2.2"
}
}
}
}
},
"opener": {
"version": "1.3.0"
},
"chmodr": {
"version": "0.1.0"
},
"cmd-shim": {
"version": "1.1.0"
},
"sha": {
"version": "1.0.1"
},
"editor": {
"version": "0.0.4"
},
"child-process-close": {
"version": "0.1.1"
},
"npm-user-validate": {
"version": "0.0.1"
}
}
}
}
},
"express": {
"version": "2.5.11",
"dependencies": {
@ -297,6 +38,9 @@
"pg": {
"version": "2.6.2",
"dependencies": {
"generic-pool": {
"version": "2.0.3"
},
"buffer-writer": {
"version": "1.0.0",
"dependencies": {
@ -316,7 +60,7 @@
}
},
"generic-pool": {
"version": "2.0.3"
"version": "2.0.4"
},
"redis": {
"version": "0.7.1"
@ -325,7 +69,7 @@
"version": "0.1.15",
"dependencies": {
"bindings": {
"version": "1.1.0"
"version": "1.1.1"
}
}
},

1
package.json
View File

@ -13,7 +13,6 @@
"Sandro Santilli <strk@vizzuality.com>"
],
"dependencies": {
"cluster2": "git://github.com/CartoDB/cluster2.git#cdb_production",
"express": "~2.5.11",
"underscore" : "~1.3.3",
"underscore.string": "~1.1.6",