refactor: more review suggestions 🎉

Signed-off-by: Camila Belo <camilaibs@gmail.com>
This commit is contained in:
Camila Belo
2024-11-21 16:00:16 +01:00
parent 4e7001b8c8
commit 7fc03dc1c1
2 changed files with 9 additions and 10 deletions
@@ -255,12 +255,12 @@ describe('MiddlewareFactory', () => {
),
{
type: 'incomingRequest',
date: 'Wed, 20 Nov 2024 00:00:00 GMT',
date: '2024-11-20T00:00:00.000Z',
method: 'GET',
url: '/',
status: 200,
httpVersion: '1.1',
contentLength: '11',
contentLength: 11,
},
);
});
@@ -282,14 +282,14 @@ describe('MiddlewareFactory', () => {
),
{
type: 'incomingRequest',
date: 'Wed, 20 Nov 2024 00:00:00 GMT',
date: '2024-11-20T00:00:00.000Z',
method: 'GET',
url: '/',
status: 200,
httpVersion: '1.1',
userAgent: 'test-agent',
referrer: 'test-referrer',
contentLength: '11',
contentLength: 11,
},
);
});
@@ -56,13 +56,14 @@ function getLogMeta(
res: ServerResponse,
) {
const status = Number(tokens.status(req, res));
const contentLength = Number(tokens.res(req, res, 'content-length'));
return {
date: tokens.date(req, res, 'web'),
date: tokens.date(req, res, 'iso'),
method: tokens.method(req, res),
url: tokens.url(req, res),
httpVersion: tokens['http-version'](req, res),
status: isNaN(status) ? undefined : status,
contentLength: tokens.res(req, res, 'content-length'),
status: isFinite(status) ? status : undefined,
contentLength: isFinite(contentLength) ? contentLength : undefined,
referrer: tokens.referrer(req, res),
userAgent: tokens.req(req, res, 'user-agent'),
};
@@ -173,9 +174,7 @@ export class MiddlewareFactory {
const { meta, message } = JSON.parse(json);
logger.info(message.trimEnd(), {
type: 'incomingRequest',
...Object.entries(meta).reduce((rest, [key, value]) => {
return value ? { ...rest, [key]: value } : rest;
}, {}),
...meta,
});
},
},