Skip to content

Commit

Permalink
Allow specifying level for request start/complete logging (#184)
Browse files Browse the repository at this point in the history
  • Loading branch information
roessland committed Jul 17, 2023
1 parent b28b999 commit 8fa00a0
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 4 deletions.
20 changes: 19 additions & 1 deletion README.md
Expand Up @@ -149,7 +149,7 @@ events"](#hapievents) section.

### `options.customRequestCompleteMessage`

**Default**: '[response] ${request.method} ${request.path} ${request.raw.res.statusCode} (${responseTime}ms)'
**Default**: `` `[response] ${request.method} ${request.path} ${request.raw.res.statusCode} (${responseTime}ms)` ``

Set to a `function (request, responseTime) => { /* returns message string */ }`. This function will be invoked at each completed request, setting "msg" property to returned string. If not set, default value will be used.

Expand All @@ -159,6 +159,24 @@ events"](#hapievents) section.

Set to a `function (request, err) => { /* returns message string */ }`. This function will be invoked at each failed request, setting "msg" property to returned string. If not set, default value will be used.

### `options.customRequestStartLevel: pino.Level`

**Default**: 'info'

The log level to use for `request start` events.

### `options.customRequestCompleteLevel: pino.Level`

**Default**: 'info'

The log level to use for `request complete` events.

### `options.customRequestErrorLevel: pino.Level`

**Default**: 'error'

The logging level to use for `request-error` events.

### `options.stream` Pino.DestinationStream

**Default**: `process.stdout`
Expand Down
3 changes: 3 additions & 0 deletions index.d.ts
Expand Up @@ -27,6 +27,9 @@ declare namespace HapiPino {
customRequestStartMessage?: ((req: Request) => string) | undefined;
customRequestCompleteMessage?: ((req: Request, responseTime: number) => string) | undefined;
customRequestErrorMessage?: ((req: Request, error: Error) => string) | undefined;
customRequestStartLevel?: pino.Level | undefined;
customRequestCompleteLevel?: pino.Level | undefined;
customRequestErrorLevel?: pino.Level | undefined;
tags?: { [key in pino.Level]?: string } | undefined;
stream?: NodeJS.WriteStream | undefined;
allTags?: pino.Level | undefined;
Expand Down
10 changes: 7 additions & 3 deletions index.js
Expand Up @@ -103,6 +103,10 @@ async function register (server, options) {
const requestCompleteMessage = options.customRequestCompleteMessage || function (request, responseTime) { return `[response] ${request.method} ${request.path} ${request.raw.res.headersSent ? request.raw.res.statusCode : '-'} (${responseTime}ms)` }
const requestErrorMessage = options.customRequestErrorMessage || function (request, error) { return error.message } // Will default to `Internal Server Error` by hapi

const requestStartLevel = options.customRequestStartLevel || 'info'
const requestCompleteLevel = options.customRequestCompleteLevel || 'info'
const requestErrorLevel = options.customRequestErrorLevel || 'error'

// expose logger as 'server.logger'
server.decorate('server', 'logger', logger)

Expand All @@ -117,7 +121,7 @@ async function register (server, options) {
request.logger = logger.child(childBindings)

if (shouldLogRequestStart(request)) {
request.logger.info({
request.logger[requestStartLevel]({
req: childBindings.req ? undefined : request
}, requestStartMessage(request))
}
Expand Down Expand Up @@ -151,7 +155,7 @@ async function register (server, options) {
}

if (event.error && isEnabledLogEvent(options, 'request-error')) {
request.logger.error(
request.logger[requestErrorLevel](
{
tags: event.tags,
err: event.error
Expand Down Expand Up @@ -179,7 +183,7 @@ async function register (server, options) {

// If you want `req` to be added either use the default `getChildBindings` or make sure `req` is passed in your custom bindings.
const responseTime = (info.completed !== undefined ? info.completed : info.responded) - info.received
request.logger.info(
request.logger[requestCompleteLevel](
{
payload: options.logPayload ? request.payload : undefined,
queryParams: options.logQueryParams ? request.query : undefined,
Expand Down
26 changes: 26 additions & 0 deletions test.js
Expand Up @@ -1559,6 +1559,32 @@ experiment('options.logRequestComplete', () => {
await server.inject('/something')
await finish
})

test('when options.logRequestComplete is true and options.customRequestCompleteLevel is set', async () => {
const server = getServer()
let done
const finish = new Promise(function (resolve, reject) {
done = resolve
})
const stream = sink(data => {
expect(data.msg).to.startWith('[response]')
expect(data.level).to.equal(20)
done()
})
const plugin = {
plugin: Pino,
options: {
stream,
level: 'debug',
logRequestComplete: true,
customRequestCompleteLevel: 'debug'
}
}

await server.register(plugin)
await server.inject('/something')
await finish
})
})

experiment('logging with mergeHapiLogData option enabled', () => {
Expand Down

0 comments on commit 8fa00a0

Please sign in to comment.