diff --git a/apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx b/apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx index 39bff46a..982a7ad6 100644 --- a/apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx +++ b/apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx @@ -94,6 +94,7 @@ export const ShowDeployment = ({ logPath, open, onClose, serverId }: Props) => { )) || "Loading..."}
diff --git a/apps/dokploy/components/dashboard/compose/deployments/show-deployment-compose.tsx b/apps/dokploy/components/dashboard/compose/deployments/show-deployment-compose.tsx index 4439a984..eb03f128 100644 --- a/apps/dokploy/components/dashboard/compose/deployments/show-deployment-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/deployments/show-deployment-compose.tsx @@ -102,6 +102,7 @@ export const ShowDeploymentCompose = ({ )) || "Loading..."}
diff --git a/apps/dokploy/components/dashboard/docker/logs/docker-logs-id.tsx b/apps/dokploy/components/dashboard/docker/logs/docker-logs-id.tsx index 6873ef9b..78304ab3 100644 --- a/apps/dokploy/components/dashboard/docker/logs/docker-logs-id.tsx +++ b/apps/dokploy/components/dashboard/docker/logs/docker-logs-id.tsx @@ -20,7 +20,7 @@ interface Props { } type TimeFilter = "all" | "1h" | "6h" | "24h" | "168h" | "720h"; -type TypeFilter = "all" | "error" | "warning" | "success" | "info"; +type TypeFilter = "all" | "error" | "warning" | "success" | "info" | "debug"; export const DockerLogsId: React.FC = ({ containerId, serverId }) => { const { data } = api.docker.getConfig.useQuery( @@ -225,7 +225,10 @@ export const DockerLogsId: React.FC = ({ containerId, serverId }) => { Error - Warning + Warning + + + Debug Success diff --git a/apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx b/apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx index bc04b26d..5077988d 100644 --- a/apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx +++ b/apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx @@ -12,10 +12,11 @@ import { type LogLine, getLogType } from "./utils"; interface LogLineProps { log: LogLine; + noTimestamp?: boolean; searchTerm?: string; } -export function TerminalLine({ log, searchTerm }: LogLineProps) { +export function TerminalLine({ log, noTimestamp, searchTerm }: LogLineProps) { const { timestamp, message, rawTimestamp } = log; const { type, variant, color } = getLogType(message); @@ -72,7 +73,9 @@ export function TerminalLine({ log, searchTerm }: LogLineProps) { ? "bg-red-500/10 hover:bg-red-500/15" : type === "warning" ? "bg-yellow-500/10 hover:bg-yellow-500/15" - : "hover:bg-gray-200/50 dark:hover:bg-gray-800/50", + : type === "debug" + ? "bg-orange-500/10 hover:bg-orange-500/15" + : "hover:bg-gray-200/50 dark:hover:bg-gray-800/50", )} > {" "} @@ -80,9 +83,13 @@ export function TerminalLine({ log, searchTerm }: LogLineProps) { {/* Icon to expand the log item maybe implement a colapsible later */} {/* */} {tooltip(color, rawTimestamp)} - - {formattedTime} - + {!noTimestamp && ( + + {formattedTime} + + )} + + = { }, warning: { type: "warning", + variant: "orange", + color: "bg-orange-500/40", + }, + debug: { + type: "debug", variant: "yellow", color: "bg-yellow-500/40", }, @@ -88,7 +93,7 @@ export const getLogType = (message: string): LogStyle => { /Error:\s.*(?:in|at)\s+.*:\d+(?::\d+)?/.test(lowerMessage) || /\b(?:errno|code):\s*(?:\d+|[A-Z_]+)\b/i.test(lowerMessage) || /\[(?:error|err|fatal)\]/i.test(lowerMessage) || - /\b(?:&ash|critical|fatal)\b/i.test(lowerMessage) || + /\b(?:crash|critical|fatal)\b/i.test(lowerMessage) || /\b(?:fail(?:ed|ure)?|broken|dead)\b/i.test(lowerMessage) ) { return LOG_STYLES.error; @@ -124,10 +129,10 @@ export const getLogType = (message: string): LogStyle => { if ( /(?:^|\s)(?:info|inf):?\s/i.test(lowerMessage) || - /\[(info|log|debug|trace|server|db|api)\]/i.test(lowerMessage) || - /\b(?:version|config|start|import|load)\b:?/i.test(lowerMessage) + /\[(info|log|debug|trace|server|db|api|http|request|response)\]/i.test(lowerMessage) || + /\b(?:version|config|import|load)\b:?/i.test(lowerMessage) ) { - return LOG_STYLES.info; + return LOG_STYLES.debug; } return LOG_STYLES.info;