Skip to content

Commit

Permalink
feat: log requests refused before processing starts
Browse files Browse the repository at this point in the history
Fastify can reject requests outright before any of the normal request processing begins right now: an unsupported HTTP version, or if the server is currently closing and `return503OnClosing` is true. Before this change, these requests wouldn't appear in the logs at all, which can make debugging them kind of confusing.

This change adds a log message for these requests, so that they can be found by operators and a strange looking status code can be explained more easily.
  • Loading branch information
airhorns committed Feb 25, 2023
1 parent 562332a commit 880a5f0
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 16 deletions.
34 changes: 18 additions & 16 deletions lib/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,25 @@ function buildRouting (options) {

// HTTP request entry point, the routing has already been executed
function routeHandler (req, res, params, context, query) {
const id = genReqId(req)

const loggerBinding = {
[requestIdLogLabel]: id
}

const loggerOpts = {
level: context.logLevel
}

if (context.logSerializers) {
loggerOpts.serializers = context.logSerializers
}
const childLogger = logger.child(loggerBinding, loggerOpts)
childLogger[kDisableRequestLogging] = disableRequestLogging

// TODO: The check here should be removed once https://github.com/nodejs/node/issues/43115 resolve in core.
if (!validateHTTPVersion(req.httpVersion)) {
childLogger.info({ res: { statusCode: 505 } }, 'request aborted - invalid HTTP version')
const message = '{"error":"HTTP Version Not Supported","message":"HTTP Version Not Supported","statusCode":505}'
const headers = {
'Content-Type': 'application/json',
Expand Down Expand Up @@ -424,6 +441,7 @@ function buildRouting (options) {
}
res.writeHead(503, headers)
res.end('{"error":"Service Unavailable","message":"Service Unavailable","statusCode":503}')
childLogger.info({ res: { statusCode: 503 } }, 'request aborted - refusing to accept new requests as server is closing')
return
}
}
Expand All @@ -445,22 +463,6 @@ function buildRouting (options) {
req.headers[kRequestAcceptVersion] = undefined
}

const id = genReqId(req)

const loggerBinding = {
[requestIdLogLabel]: id
}

const loggerOpts = {
level: context.logLevel
}

if (context.logSerializers) {
loggerOpts.serializers = context.logSerializers
}
const childLogger = logger.child(loggerBinding, loggerOpts)
childLogger[kDisableRequestLogging] = disableRequestLogging

const request = new context.Request(id, params, req, query, childLogger, context)
const reply = new context.Reply(res, request, childLogger)

Expand Down
35 changes: 35 additions & 0 deletions test/close.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const test = t.test
const Fastify = require('..')
const { Client } = require('undici')
const semver = require('semver')
const split = require('split2')

test('close callback', t => {
t.plan(4)
Expand Down Expand Up @@ -303,6 +304,40 @@ t.test('Current opened connection should not accept new incoming connections', t
})
})

t.test('rejected incoming connections should be logged', t => {
t.plan(2)
const stream = split(JSON.parse)
const fastify = Fastify({
forceCloseConnections: false,
logger: {
stream,
level: 'info'
}
})

const messages = []
stream.on('data', message => {
messages.push(message)
})
fastify.get('/', (req, reply) => {
fastify.close()
setTimeout(() => {
reply.send({ hello: 'world' })
}, 250)
})

fastify.listen({ port: 0 }, err => {
t.error(err)
const instance = new Client('http://localhost:' + fastify.server.address().port)
// initial request to trigger close
instance.request({ path: '/', method: 'GET' })
// subsequent request should be rejected
instance.request({ path: '/', method: 'GET' }).then(() => {
t.ok(messages.find(message => message.msg.includes('request aborted')))
})
})
})

test('Cannot be reopened the closed server without listen callback', async t => {
t.plan(2)
const fastify = Fastify()
Expand Down

0 comments on commit 880a5f0

Please sign in to comment.