Skip to content
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.

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

fix: #308 include req.readableAborted flag to defaultSuccessfulRequestMessageProvider #309

Merged
merged 5 commits into from
Dec 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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