Skip to content

Commit fe1b1ba

Browse files
committed
refactor: use context provider for logs
1 parent 6db34f8 commit fe1b1ba

File tree

8 files changed

+9
-11
lines changed

8 files changed

+9
-11
lines changed

src/infrastructure/logging/index.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { pino } from 'pino';
22
import * as process from 'process';
33
import type { LoggingConfig } from '../config/index.js';
44
import appConfig from '../config/index.js';
5-
import type { FastifyRequest } from 'fastify';
65
import { getCurrentReqId } from './reqId.context.js';
76

87
const loggerConfig = process.env['NODE_ENV'] === 'production'
@@ -41,12 +40,11 @@ export function getLogger(moduleName: keyof LoggingConfig): pino.Logger {
4140
/**
4241
* Creates a request-scoped logger that includes the request ID
4342
* @param moduleName - name of the module that is logging
44-
* @param request - Fastify request object containing reqId
4543
* @returns Logger instance with request ID context
4644
*/
47-
export function getRequestLogger(moduleName: keyof LoggingConfig, request?: FastifyRequest): pino.Logger {
45+
export function getRequestLogger(moduleName: keyof LoggingConfig): pino.Logger {
4846
const baseLogger = getLogger(moduleName);
49-
const reqId = getCurrentReqId() ?? request?.id;
47+
const reqId = getCurrentReqId();
5048

5149
if (reqId) {
5250
return baseLogger.child({

src/presentation/http/middlewares/common/userIdResolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default function addUserIdResolver(server: FastifyInstance, authService:
1919
* Resolve userId from Access Token on each request
2020
*/
2121
server.addHook('preHandler', (request, _reply, done) => {
22-
const logger = getRequestLogger('middlewares', request);
22+
const logger = getRequestLogger('middlewares');
2323
const authorizationHeader = request.headers.authorization;
2424

2525
if (notEmpty(authorizationHeader)) {

src/presentation/http/middlewares/note/useNoteResolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default function useNoteResolver(noteService: NoteService): {
3535

3636
return {
3737
noteResolver: async function noteIdResolver(request, reply) {
38-
const logger = getRequestLogger('middlewares', request);
38+
const logger = getRequestLogger('middlewares');
3939
let note: Note | undefined;
4040

4141
let statusCode = StatusCodes.NOT_ACCEPTABLE;

src/presentation/http/middlewares/noteSettings/useMemberRoleResolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default function useMemberRoleResolver(noteSettingsService: NoteSettingsS
1919

2020
return {
2121
memberRoleResolver: async function memberRoleResolver(request, reply) {
22-
const logger = getRequestLogger('middlewares', request);
22+
const logger = getRequestLogger('middlewares');
2323
/** If MemberRole equals null, it means that user is not in the team or is not authenticated */
2424
let memberRole: MemberRole | undefined;
2525

src/presentation/http/middlewares/noteSettings/useNoteSettingsResolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default function useNoteSettingsResolver(noteSettingsService: NoteSetting
1818

1919
return {
2020
noteSettingsResolver: async function noteSettingsResolver(request, reply) {
21-
const logger = getRequestLogger('middlewares', request);
21+
const logger = getRequestLogger('middlewares');
2222
let noteSettings: NoteSettings | null;
2323

2424
try {

src/presentation/http/policies/authRequired.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { getRequestLogger } from '@infrastructure/logging/index.js';
77
*/
88
export default async function authRequired(context: PolicyContext): Promise<void> {
99
const { request, reply } = context;
10-
const logger = getRequestLogger('policies', request);
10+
const logger = getRequestLogger('policies');
1111

1212
const { userId } = request;
1313

src/presentation/http/policies/notePublicOrUserInTeam.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { getRequestLogger } from '@infrastructure/logging/index.js';
99
*/
1010
export default async function notePublicOrUserInTeam(context: PolicyContext): Promise<void> {
1111
const { request, reply, domainServices } = context;
12-
const logger = getRequestLogger('policies', request);
12+
const logger = getRequestLogger('policies');
1313

1414
const { userId } = request;
1515

src/presentation/http/policies/userCanEdit.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { getRequestLogger } from '@infrastructure/logging/index.js';
99
*/
1010
export default async function userCanEdit(context: PolicyContext): Promise<void> {
1111
const { request, reply, domainServices } = context;
12-
const logger = getRequestLogger('policies', request);
12+
const logger = getRequestLogger('policies');
1313

1414
const { userId } = request;
1515

0 commit comments

Comments
 (0)