Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
refactor: use context provider for logs
  • Loading branch information
7eliassen committed Mar 11, 2026
commit fe1b1ba87fc003eb41134766a44c0e180ac2a08f
6 changes: 2 additions & 4 deletions src/infrastructure/logging/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { pino } from 'pino';
import * as process from 'process';
import type { LoggingConfig } from '../config/index.js';
import appConfig from '../config/index.js';
import type { FastifyRequest } from 'fastify';
import { getCurrentReqId } from './reqId.context.js';

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

if (reqId) {
return baseLogger.child({
Expand Down
2 changes: 1 addition & 1 deletion src/presentation/http/middlewares/common/userIdResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function addUserIdResolver(server: FastifyInstance, authService:
* Resolve userId from Access Token on each request
*/
server.addHook('preHandler', (request, _reply, done) => {
const logger = getRequestLogger('middlewares', request);
const logger = getRequestLogger('middlewares');
const authorizationHeader = request.headers.authorization;

if (notEmpty(authorizationHeader)) {
Expand Down
2 changes: 1 addition & 1 deletion src/presentation/http/middlewares/note/useNoteResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default function useNoteResolver(noteService: NoteService): {

return {
noteResolver: async function noteIdResolver(request, reply) {
const logger = getRequestLogger('middlewares', request);
const logger = getRequestLogger('middlewares');
let note: Note | undefined;

let statusCode = StatusCodes.NOT_ACCEPTABLE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function useMemberRoleResolver(noteSettingsService: NoteSettingsS

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function useNoteSettingsResolver(noteSettingsService: NoteSetting

return {
noteSettingsResolver: async function noteSettingsResolver(request, reply) {
const logger = getRequestLogger('middlewares', request);
const logger = getRequestLogger('middlewares');
let noteSettings: NoteSettings | null;

try {
Expand Down
2 changes: 1 addition & 1 deletion src/presentation/http/policies/authRequired.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { getRequestLogger } from '@infrastructure/logging/index.js';
*/
export default async function authRequired(context: PolicyContext): Promise<void> {
const { request, reply } = context;
const logger = getRequestLogger('policies', request);
const logger = getRequestLogger('policies');

const { userId } = request;

Expand Down
2 changes: 1 addition & 1 deletion src/presentation/http/policies/notePublicOrUserInTeam.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { getRequestLogger } from '@infrastructure/logging/index.js';
*/
export default async function notePublicOrUserInTeam(context: PolicyContext): Promise<void> {
const { request, reply, domainServices } = context;
const logger = getRequestLogger('policies', request);
const logger = getRequestLogger('policies');

const { userId } = request;

Expand Down
2 changes: 1 addition & 1 deletion src/presentation/http/policies/userCanEdit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { getRequestLogger } from '@infrastructure/logging/index.js';
*/
export default async function userCanEdit(context: PolicyContext): Promise<void> {
const { request, reply, domainServices } = context;
const logger = getRequestLogger('policies', request);
const logger = getRequestLogger('policies');

const { userId } = request;

Expand Down