From e6a55920b507678709f7e6fcfef71ae0d6a8268c Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Fri, 6 Sep 2024 23:22:12 -0600 Subject: [PATCH] fix: filter logs correctly by dokploy ui --- apps/dokploy/components/dashboard/requests/columns.tsx | 7 +++++-- apps/dokploy/server/utils/access-log/utils.ts | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/dokploy/components/dashboard/requests/columns.tsx b/apps/dokploy/components/dashboard/requests/columns.tsx index 523e97bf..ebcfb453 100644 --- a/apps/dokploy/components/dashboard/requests/columns.tsx +++ b/apps/dokploy/components/dashboard/requests/columns.tsx @@ -49,8 +49,11 @@ export const columns: ColumnDef[] = [ const log = row.original; return (
-
- {log.RequestMethod} {log.RequestPath} +
+ {log.RequestMethod}{" "} + {log.RequestPath.length > 100 + ? `${log.RequestPath.slice(0, 82)}...` + : log.RequestPath}
diff --git a/apps/dokploy/server/utils/access-log/utils.ts b/apps/dokploy/server/utils/access-log/utils.ts index b0d1afef..54f2e7e3 100644 --- a/apps/dokploy/server/utils/access-log/utils.ts +++ b/apps/dokploy/server/utils/access-log/utils.ts @@ -63,6 +63,10 @@ export function parseRawConfig( .map((line) => JSON.parse(line) as LogEntry) .value(); + parsedLogs = parsedLogs.filter( + (log) => log.ServiceName !== "dokploy-service-app@file", + ); + if (search) { parsedLogs = parsedLogs.filter((log) => log.RequestPath.toLowerCase().includes(search.toLowerCase()), @@ -90,10 +94,6 @@ export function parseRawConfig( parsedLogs = parsedLogs.slice(startIndex, startIndex + page.pageSize); } - parsedLogs = parsedLogs.filter( - (log) => log.ServiceName !== "dokploy-service-app@file", - ); - const totalCount = parsedLogs.length; return { data: parsedLogs, totalCount };