cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop unused cluster support

Browse Source
This commit is contained in:
Sandro Santilli
2013-06-17 11:57:35 +02:00
parent 6cb8c85da0
commit 850d4cd6ba
3 changed files with 0 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cluster.js
-64
View File
@@ -1,64 +0,0 @@
/*
* Windshaft-CartoDB
* ===============
*
* ./app.js [environment]
*
* environments: [development, production]
*/
var Cluster = require('cluster2');
// sanity check
var ENV = process.argv[2]
if (ENV != 'development' && ENV != 'production' && ENV != 'staging'){
console.error("\nnode app.js [environment]");
console.error("environments: [development, production, staging]\n");
process.exit(1);
}
var _ = require('underscore')
, Step = require('step')
, CartodbWindshaft = require('./lib/cartodb/cartodb_windshaft');
// set environment specific variables
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');
var ws = CartodbWindshaft(serverOptions);
// Maximum number of connections for one process (see apps.js)
ws.maxConnections = global.environment.maxConnections || 128;
//.use(cluster.logger('logs'))
//.use(cluster.stats())
//.use(cluster.pidfiles('pids'))
var cluster = new Cluster({
port: global.environment.port,
host: global.environment.host,
monPort: global.environment.port+1,
monHost: global.environment.host,
timeout: global.environment.socket_timeout,
noWorkers: 1
});
console.log(new Date().toISOString() + " - " + process.pid + " - Windshaft cluster starting");
cluster.listen(function(cb) {
cb(ws);
}, function() {
console.log("Windshaft tileserver started on port " + global.environment.port);
});
process.on('SIGUSR1', function() {
ws.dumpCacheStats();
});
npm-shrinkwrap.json
Generated
-291
View File
@@ -2,297 +2,6 @@
"name": "windshaft-cartodb",
"version": "1.3.1",
"dependencies": {
"cluster2": {
"version": "0.3.5-cdb02",
"from": "git://github.com/CartoDB/cluster2.git#cdb_production",
"dependencies": {
"express": {
"version": "2.5.11",
"dependencies": {
"connect": {
"version": "1.9.2",
"dependencies": {
"formidable": {
"version": "1.0.14"
}
}
},
"mime": {
"version": "1.2.4"
},
"qs": {
"version": "0.4.2"
},
"mkdirp": {
"version": "0.3.0"
}
}
},
"ejs": {
"version": "0.8.4"
},
"npm": {
"version": "1.2.28",
"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.5"
},
"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.2",
"dependencies": {
"hoek": {
"version": "0.9.1"
}
}
},
"cryptiles": {
"version": "0.2.1"
},
"sntp": {
"version": "0.2.4",
"dependencies": {
"hoek": {
"version": "0.9.1"
}
}
}
}
},
"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.9"
}
}
}
}
},
"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.10.0"
},
"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.24",
"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.4"
},
"retry": {
"version": "0.6.0"
},
"once": {
"version": "1.1.1"
},
"npmconf": {
"version": "0.1.0",
"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"
}
}
}
}
},
"node-varnish": {
"version": "0.1.1"
},
package.json
-1
View File
@@ -18,7 +18,6 @@
"email": "simon@vizzuality.com"
},
"dependencies": {
"cluster2": "git://github.com/CartoDB/cluster2.git#cdb_production",
"node-varnish": "0.1.1",
"underscore" : "~1.3.3",
"windshaft" : "~0.12.5",