mirror of
https://github.com/logsol/chuck.js.git
synced 2026-05-11 10:37:34 +00:00
optimized server starting, compatible for cloud9, added port as 2nd argument and socket.io log level as 3rd argv
This commit is contained in:
parent
3c1e7008e5
commit
48039054bb
2 changed files with 17 additions and 18 deletions
|
|
@ -1,18 +1,21 @@
|
||||||
define(['socket.io'], function(io) {
|
define(['socket.io'], function(io) {
|
||||||
|
|
||||||
function Socket(server, coordinator) {
|
function Socket(server, options, coordinator) {
|
||||||
|
options.logLevel = typeof options.logLevel != 'undefined'
|
||||||
|
? options.logLevel
|
||||||
|
: 0;
|
||||||
|
|
||||||
this.coordinator = coordinator;
|
this.coordinator = coordinator;
|
||||||
this.socket = io.listen(server);
|
this.socket = io.listen(server);
|
||||||
|
|
||||||
this.init(server);
|
this.init(options);
|
||||||
}
|
}
|
||||||
|
|
||||||
Socket.prototype.init = function(){
|
Socket.prototype.init = function(options){
|
||||||
|
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
this.socket.configure('development', function(){
|
this.socket.configure('development', function(){
|
||||||
this.set('log level', 0);
|
this.set('log level', options.logLevel);
|
||||||
});
|
});
|
||||||
|
|
||||||
this.socket.on('connection', function(user){
|
this.socket.on('connection', function(user){
|
||||||
|
|
@ -26,4 +29,4 @@ define(['socket.io'], function(io) {
|
||||||
|
|
||||||
return Socket;
|
return Socket;
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
20
server.js
20
server.js
|
|
@ -13,28 +13,24 @@ var requirements = [
|
||||||
"Server/Coordinator"
|
"Server/Coordinator"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
var port = process.argv[2]
|
||||||
|
|| process.env.PORT
|
||||||
|
|| process.env.npm_package_config_port;
|
||||||
|
|
||||||
requirejs(requirements, function(HttpServer, Socket, Coordinator) {
|
requirejs(requirements, function(HttpServer, Socket, Coordinator) {
|
||||||
|
|
||||||
var options = {
|
var options = {
|
||||||
port: process.env.npm_package_config_port,
|
port: port,
|
||||||
rootDirectory: './',
|
rootDirectory: './',
|
||||||
caching: false
|
caching: false,
|
||||||
|
logLevel: process.argv[3]
|
||||||
};
|
};
|
||||||
|
|
||||||
var coordinator = new Coordinator();
|
var coordinator = new Coordinator();
|
||||||
var httpServer = new HttpServer(options);
|
var httpServer = new HttpServer(options);
|
||||||
var socket = new Socket(httpServer.getServer(), coordinator);
|
var socket = new Socket(httpServer.getServer(), options, coordinator);
|
||||||
|
|
||||||
inspector.coordinator = coordinator;
|
inspector.coordinator = coordinator;
|
||||||
});
|
});
|
||||||
|
|
||||||
exports = module.exports = inspector;
|
exports = module.exports = inspector;
|
||||||
|
|
||||||
/*
|
|
||||||
belongs to channel.js
|
|
||||||
var chuck;
|
|
||||||
requirejs(["Chuck/Chuck"], function(Chuck) {
|
|
||||||
Chuck.init();
|
|
||||||
chuck = Chuck;
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue