wpstudio/hiring-test-one
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

defaults to stats mode unless a log-format is passed

Browse Source
This commit is contained in:
Lloyd Brookes
2014-02-13 14:23:17 +01:00
parent 8829ffdc2a
commit 2ec915ea17
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ws.js
View File

@ -20,10 +20,9 @@ parse command-line args
*/ */
var argv = new Thing() var argv = new Thing()
.define({ name: "port", alias: "p", type: "number", defaultOption: true, value: 8000 }) .define({ name: "port", alias: "p", type: "number", defaultOption: true, value: 8000 })
.define({ name: "log-format", alias: "f", type: "string", value: "dev" }) .define({ name: "log-format", alias: "f", type: "string" })
.define({ name: "help", alias: "h", type: "boolean" }) .define({ name: "help", alias: "h", type: "boolean" })
.define({ name: "directory", alias: "d", type: "string", value: process.cwd() }) .define({ name: "directory", alias: "d", type: "string", value: process.cwd() })
.define({ name: "stats", alias: "s", type: "boolean" })
.on("error", function(err){ .on("error", function(err){
halt(err.message); halt(err.message);
}) })
@ -56,6 +55,7 @@ if (argv.help){
}; };
process.on("SIGINT", function(){ process.on("SIGINT", function(){
console.show();
console.log(); console.log();
process.exit(0); process.exit(0);
}); });
@ -71,13 +71,13 @@ if (argv.help){
var app = connect(); var app = connect();
if(argv.stats){ if(argv["log-format"]){
app.use(connect.logger(argv["log-format"]));
} else {
app.use(function(req, res, next){ app.use(function(req, res, next){
console.column(1).write(++total.req); console.column(1).write(++total.req);
next(); next();
}); });
} else {
app.use(connect.logger(argv["log-format"]));
} }
app.use(connect.static(argv.directory)) app.use(connect.static(argv.directory))
@ -96,7 +96,8 @@ if (argv.help){
console.error("serving %u{%s} at %u{%s}", argv.directory, "http://localhost:" + argv.port); console.error("serving %u{%s} at %u{%s}", argv.directory, "http://localhost:" + argv.port);
} }
if (argv.stats){ if (!argv["log-format"]){
console.hide();
console.log("%u{Requests} %u{Data} %u{Connections}"); console.log("%u{Requests} %u{Data} %u{Connections}");
server.on("connection", function(socket){ server.on("connection", function(socket){
var oldWrite = socket.write; var oldWrite = socket.write;
@ -106,7 +107,7 @@ if (argv.help){
} }
oldWrite.call(this, data); oldWrite.call(this, data);
total.bytes += data.length; total.bytes += data.length;
console.column(12).write(w.bytesToSize(total.bytes, 2)); console.column(12).write((w.bytesToSize(total.bytes, 2) + " ").slice(0,12));
}; };
console.column(24).write(++total.connections); console.column(24).write(++total.connections);
}); });