diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..9cf9495 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +package-lock=false \ No newline at end of file diff --git a/bin.js b/bin.js index 02529a7..9a9201d 100755 --- a/bin.js +++ b/bin.js @@ -1,9 +1,15 @@ #! /usr/bin/env node var split = require('split2') var pinoColada = require('./')() +var fs = require('fs') var input = process.stdin var output = process.stdout -input - .pipe(split(pinoColada)) - .pipe(output) +input.pipe(split(pinoColada)).pipe(output) + +// https://github.com/pinojs/pino/pull/358 +if (!process.stdin.isTTY && !fs.fstatSync(process.stdin.fd).isFile()) { + process.once('SIGINT', function noOp () { + console.log() /* print a line after ^C */ + }) +} diff --git a/index.js b/index.js index da9b65f..d965474 100644 --- a/index.js +++ b/index.js @@ -76,9 +76,9 @@ function PinoColada () { var req = obj.req var res = obj.res - var statusCode = (res) ? res.statusCode : obj.statusCode + var statusCode = res ? res.statusCode : obj.statusCode var responseTime = obj.responseTime || obj.elapsed - var method = (req) ? req.method : obj.method + var method = req ? req.method : obj.method var contentLength = obj.contentLength var url = (req) ? req.url : obj.url var stack = (obj.level === 'fatal' || obj.level === 'error') @@ -133,7 +133,8 @@ function PinoColada () { if (obj.level === 'trace') pretty = chalk.white(msg) if (obj.level === 'warn') pretty = chalk.magenta(msg) if (obj.level === 'debug') pretty = chalk.yellow(msg) - if (obj.level === 'info' || obj.level === 'userlvl') pretty = chalk.green(msg) + if (obj.level === 'info' || obj.level === 'userlvl') + pretty = chalk.green(msg) if (obj.level === 'fatal') pretty = chalk.white.bgRed(msg) return pretty } diff --git a/package.json b/package.json index c94fa49..4e1665f 100644 --- a/package.json +++ b/package.json @@ -22,11 +22,11 @@ "pretty-printer" ], "devDependencies": { - "@hapi/hapi": "^18.0.0", - "hapi-pino": "^6.3.0", - "merry": "^4.0.0", - "pino-http": "^4.3.0", - "standard": "^14.0.0" + "@hapi/hapi": "^20.0.2", + "hapi-pino": "^8.3.0", + "merry": "^5.5.2", + "pino-http": "^5.3.0", + "standard": "^16.0.3" }, "dependencies": { "chalk": "^3.0.0", @@ -34,7 +34,7 @@ "pad-left": "^2.1.0", "pad-right": "^0.2.2", "prettier-bytes": "^1.0.3", - "pretty-ms": "^5.0.0", + "pretty-ms": "^7.0.1", "split2": "^3.0.0" } }