Skip to content

Commit

Permalink
Address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
adhityamamallan committed Aug 27, 2024
1 parent f355d85 commit 9f82220
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 9 deletions.
6 changes: 3 additions & 3 deletions src/route-handlers/describe-domain/describe-domain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server';
import decodeUrlParams from '@/utils/decode-url-params';
import * as grpcClient from '@/utils/grpc/grpc-client';
import { getHTTPStatusCode, GRPCError } from '@/utils/grpc/grpc-error';
import logger from '@/utils/logger';
import logger, { type RouteHandlerErrorPayload } from '@/utils/logger';

import { type RequestParams, type RouteParams } from './describe-domain.types';

Expand All @@ -20,8 +20,8 @@ export async function describeDomain(

return NextResponse.json(res.domain);
} catch (e) {
logger.error(
{ requestParams: decodedParams, error: e },
logger.error<RouteHandlerErrorPayload>(
{ requestParams: decodedParams, cause: e },
'Error fetching domain info'
);

Expand Down
6 changes: 3 additions & 3 deletions src/route-handlers/list-workflows/list-workflows.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server';
import decodeUrlParams from '@/utils/decode-url-params';
import * as grpcClient from '@/utils/grpc/grpc-client';
import { getHTTPStatusCode, GRPCError } from '@/utils/grpc/grpc-error';
import logger from '@/utils/logger';
import logger, { type RouteHandlerErrorPayload } from '@/utils/logger';

import getListWorkflowExecutionsQuery from './helpers/get-list-workflow-executions-query';
import mapExecutionsToWorkflows from './helpers/map-executions-to-workflows';
Expand Down Expand Up @@ -59,8 +59,8 @@ export async function listWorkflows(

return NextResponse.json(response);
} catch (e) {
logger.error(
{ requestParams: decodedParams, queryParams, error: e },
logger.error<RouteHandlerErrorPayload>(
{ requestParams: decodedParams, queryParams, cause: e },
'Error fetching workflows' +
(e instanceof GRPCError ? ': ' + e.message : '')
);
Expand Down
8 changes: 6 additions & 2 deletions src/route-handlers/log-to-server/log-to-server.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
import { NextResponse, type NextRequest } from 'next/server';

import logger from '@/utils/logger';
import logger, { type RouteHandlerErrorPayload } from '@/utils/logger';

import logToServerPayloadSchema from './schemas/log-to-server-payload-schema';

export async function logToServer(request: NextRequest) {
const requestBodyJSON = await request.json();
const { data, error } = logToServerPayloadSchema.safeParse(requestBodyJSON);
if (error) {
logger.error(error, 'Failed to parse log from browser');
logger.error<RouteHandlerErrorPayload>(
{ cause: error },
'Failed to parse log from browser'
);

return NextResponse.json(
{
message: 'Could not log browser log on server',
cause: error.errors,
},
{
status: 400,
Expand Down
1 change: 1 addition & 0 deletions src/utils/logger/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ export const LOG_LEVELS = Object.values(logger.levels.labels);

// Types
export { type LogLevel as LogLevel } from './pino/pino.types';
export * from './logger.types';

export default logger;
5 changes: 5 additions & 0 deletions src/utils/logger/logger.types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export type RouteHandlerErrorPayload = {
cause?: any;
requestParams?: object;
queryParams?: object;
};
4 changes: 3 additions & 1 deletion src/utils/request/request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ export default function request(
async (res) => {
if (!res.ok) {
const error = await res.json();
throw new RequestError(error.message, res.status);
throw new RequestError(error.message, res.status, {
cause: error.cause,
});
}
return res;
}
Expand Down

0 comments on commit 9f82220

Please sign in to comment.