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

logstalgia now has its own output format, rather than being the default

Browse Source
This commit is contained in:
Lloyd Brookes
2014-06-13 18:42:35 +01:00
parent 8249588350
commit 6c99257224
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -22,7 +22,7 @@ $ npm install -g local-web-server
Usage Usage
----- -----
``` ```
$ ws [--directory|-d <directory>] [--port|-p <port>] [--log-format|-f dev|default|short|tiny] [--compress|-c] $ ws [--directory|-d <directory>] [--port|-p <port>] [--log-format|-f dev|default|short|tiny|logstalgia] [--compress|-c]
$ ws --config $ ws --config
$ ws --help|-h $ ws --help|-h
``` ```
@ -103,9 +103,9 @@ $ brew install logstalgia
Alternatively, [download a release for your system from github](https://github.com/acaudwell/Logstalgia/releases/latest). Alternatively, [download a release for your system from github](https://github.com/acaudwell/Logstalgia/releases/latest).
Then pipe the `default` output directly into logstalgia for real-time visualisation: Then pipe the `logstalgia` output format directly into logstalgia for real-time visualisation:
```sh ```sh
$ ws -f default | logstalgia - $ ws -f logstalgia | logstalgia -
``` ```
![local-web-server with logstalgia](http://75lb.github.io/local-web-server/logstagia.gif) ![local-web-server with logstalgia](http://75lb.github.io/local-web-server/logstagia.gif)

22
bin/ws.js
View File

@ -19,7 +19,7 @@ var dope = require("console-dope"),
var usage = var usage =
"usage: \n\ "usage: \n\
$ ws [--directory|-d <dir>] [--port|-p <port>] [--log-format|-f dev|default|short|tiny] [--compress|-c]\n\ $ ws [--directory|-d <dir>] [--port|-p <port>] [--log-format|-f dev|default|short|tiny|logstalgia] [--compress|-c]\n\
$ ws --config\n\ $ ws --config\n\
$ ws --help|-h"; $ ws --help|-h";
@ -48,7 +48,6 @@ try {
{ name: "help", alias: "h", type: Boolean }, { name: "help", alias: "h", type: Boolean },
{ name: "directory", alias: "d", type: String, value: process.cwd() }, { name: "directory", alias: "d", type: String, value: process.cwd() },
{ name: "config", type: Boolean }, { name: "config", type: Boolean },
{ name: "logstalgia", type: Boolean },
{ name: "compress", alias: "c", type: Boolean } { name: "compress", alias: "c", type: Boolean }
]).parse(); ]).parse();
} catch(err){ } catch(err){
@ -56,15 +55,6 @@ try {
} }
argv = o.extend(storedConfig, argv); argv = o.extend(storedConfig, argv);
if (argv.logstalgia){
/* customised logger :date token, purely to satisfy Logstalgia. */
morgan.token("date", function(){
var a = new Date();
return (a.getDate() + "/" + a.getUTCMonth() + "/" + a.getFullYear() + ":" + a.toTimeString())
.replace("GMT", "").replace(" (BST)", "");
});
}
if (argv.config){ if (argv.config){
dope.log("Stored config: "); dope.log("Stored config: ");
dope.log(storedConfig); dope.log(storedConfig);
@ -90,6 +80,16 @@ if (argv.config){
/* log using --log-format (if supplied) */ /* log using --log-format (if supplied) */
if(argv["log-format"]) { if(argv["log-format"]) {
if (argv["log-format"] === "logstalgia"){
/* customised logger :date token, purely to satisfy Logstalgia. */
morgan.token("date", function(){
var a = new Date();
return (a.getDate() + "/" + a.getUTCMonth() + "/" + a.getFullYear() + ":" + a.toTimeString())
.replace("GMT", "").replace(" (BST)", "");
});
argv["log-format"] = "default";
}
app.use(morgan(argv["log-format"])); app.use(morgan(argv["log-format"]));
} else { } else {
var statStream = clf(); var statStream = clf();