Skip to content

Commit

Permalink
fix: #308 include req.readableAborted flag to defaultSuccessfulReques…
Browse files Browse the repository at this point in the history
…tMessageProvider (#309)
  • Loading branch information
someden authored Dec 27, 2023
1 parent b06bfe3 commit 8b2e812
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
contents: read
strategy:
matrix:
node-version: [14, 16, 18]
node-version: [18, 20, 21]
steps:
- name: Check out repo
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion logger.js
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ function defaultFailedRequestMessageProvider () {

function defaultSuccessfulRequestMessageProvider (req, res) {
/* istanbul ignore next */
return res.writableEnded ? 'request completed' : 'request aborted'
return !req.readableAborted && res.writableEnded ? 'request completed' : 'request aborted'
}

module.exports = pinoLogger
Expand Down
29 changes: 29 additions & 0 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,35 @@ test('log requests aborted during payload', { skip: true }, function (t) {
})
})

test('log requests aborted on the server', function (t) {
const dest = split(JSON.parse)
const logger = pinoHttp(dest)

function handle (req, res) {
logger(req, res)

req.destroy()
res.end()
}

function listen (err, server) {
t.error(err)
const client = doGet(server)

client.on('error', function () {
// skip error
})
}

setup(t, logger, listen, handle)

dest.on('data', function (line) {
t.ok(line.responseTime >= 0, 'responseTime is defined')
t.equal(line.msg, DEFAULT_REQUEST_ABORTED_MSG, 'message is set')
t.end()
})
})

test('no auto logging with autoLogging set to false', function (t) {
const dest = split(JSON.parse)
const logger = pinoHttp({ autoLogging: false }, dest)
Expand Down

0 comments on commit 8b2e812

Please sign in to comment.