Skip to content

Fix SIGINT error and update npm packages #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix SIGINT error and update npm packages #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf7cd50
update package versions, fixed SIGINT error, added .npmrc (no lock file)
Nov 21, 2020
7cd20d4
added .npmrc
Nov 21, 2020
1d1feca
Merge branch 'master' into master
holmok Nov 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
12 changes: 9 additions & 3 deletions bin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 */
})
}
7 changes: 4 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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
}
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
"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",
"fast-json-parse": "^1.0.2",
"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"
}
}