Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: remove custom timestamps and rely soley on dockers log timestamps
Kyle Mendellc69e00a30f9b
diff --git a/backend/internal/api/container_handler.go b/backend/internal/api/container_handler.goindex 2d615a7e1..d3094c396 100644--- a/backend/internal/api/container_handler.go+++ b/backend/internal/api/container_handler.go@@ -162,7 +162,7 @@ func (h *ContainerHandler) GetLogsWS(c *gin.Context) {follow := c.DefaultQuery("follow", "true") == "true"tail := c.DefaultQuery("tail", "100")since := c.Query("since")- timestamps := c.DefaultQuery("timestamps", "false") == "true"+ timestamps := c.DefaultQuery("timestamps", "true") == "true"format := c.DefaultQuery("format", "text")batched := c.DefaultQuery("batched", "false") == "true"diff --git a/backend/internal/utils/ws/parse.go b/backend/internal/utils/ws/parse.goindex df780cece..7bdaf9c1c 100644--- a/backend/internal/utils/ws/parse.go+++ b/backend/internal/utils/ws/parse.go@@ -7,12 +7,12 @@ import ()var (- isoDockerTs = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z?\s+`)- slashDockerTs = regexp.MustCompile(`^\d{4}/\d{2}/\d{2}\s+\d{2}:\d{2}:\d{2}\s+`)+ // Docker's RFC3339 timestamp when timestamps=true+ dockerTimestamp = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z\s+`))// NormalizeContainerLine parses a raw container log line into level + cleaned message.-// It also attempts to extract a leading timestamp (returned as an RFC3339Nano string).+// It extracts Docker's timestamp if present (when timestamps=true in Docker API).func NormalizeContainerLine(raw string) (level string, msg string, timestamp string) {line := StripANSI(strings.TrimRight(raw, "\r\n"))@@ -29,29 +29,21 @@ func NormalizeContainerLine(raw string) (level string, msg string, timestamp strline = strings.TrimPrefix(line, "stdout:")}- // Strip and parse docker timestamps- if match := isoDockerTs.FindString(line); match != "" {+ // Extract and strip Docker's RFC3339 timestamp (when timestamps=true)+ timestamp = ""+ if match := dockerTimestamp.FindString(line); match != "" {trimmed := strings.TrimSpace(match)- // try multiple ISO layouts- var parsed time.Time- var err error- parsed, err = time.Parse(time.RFC3339Nano, trimmed)- if err != nil {- parsed, err = time.Parse(time.RFC3339, trimmed)- }- if err == nil {+ if parsed, err := time.Parse(time.RFC3339Nano, trimmed); err == nil {timestamp = parsed.UTC().Format(time.RFC3339Nano)- }- line = strings.TrimPrefix(line, match)- } else if match := slashDockerTs.FindString(line); match != "" {- trimmed := strings.TrimSpace(match)- parsed, err := time.Parse("2006/01/02 15:04:05", trimmed)- if err == nil {+ } else if parsed, err := time.Parse(time.RFC3339, trimmed); err == nil {timestamp = parsed.UTC().Format(time.RFC3339Nano)}line = strings.TrimPrefix(line, match)}+ // Return the message as-is (including any application-level timestamps)+ // The frontend will display Docker's timestamp, and applications can+ // include their own timestamps in the message if they wantreturn level, strings.TrimSpace(line), timestamp}diff --git a/frontend/src/lib/components/logs/log-viewer.svelte b/frontend/src/lib/components/logs/log-viewer.svelteindex 4b176adf4..6cda34049 100644--- a/frontend/src/lib/components/logs/log-viewer.svelte+++ b/frontend/src/lib/components/logs/log-viewer.svelte@@ -38,7 +38,7 @@type = 'container',maxLines = 1000,autoScroll = $bindable(true),- showTimestamps = true,+ showTimestamps = false,height = '400px',tailLines = 100,onClear,@@ -148,9 +148,7 @@type === 'project'? `/api/environments/${envId}/projects/${projectId}/logs/ws`: `/api/environments/${envId}/containers/${containerId}/logs/ws`;- return buildWebSocketEndpoint(- `${basePath}?follow=true&tail=${tailLines}×tamps=${showTimestamps}&format=json&batched=true`- );+ return buildWebSocketEndpoint(`${basePath}?follow=true&tail=${tailLines}×tamps=true&format=json&batched=true`);}export async function startLogStream() {@@ -298,11 +296,6 @@return logs.length;}- function formatTimestamp(timestamp: string): string {- const date = new Date(timestamp);- return date.toLocaleTimeString();- }-function getLevelClass(level: LogEntry['level']): string {switch (level) {case 'stderr':@@ -369,7 +362,7 @@});</script>-<div class={cn('log-viewer rounded-t-none rounded-b-xl border bg-black text-white', className)}>+<div class={cn('log-viewer rounded-b-xl rounded-t-none border bg-black text-white', className)}>{#if error}<div class="border-b border-red-700 bg-red-900/20 p-3 text-sm text-red-200">{error}@@ -378,7 +371,7 @@<divbind:this={logContainer}- class="log-viewer overflow-y-auto rounded-t-none rounded-b-xl border bg-black font-mono text-xs text-white sm:text-sm"+ class="log-viewer overflow-y-auto rounded-b-xl rounded-t-none border bg-black font-mono text-xs text-white sm:text-sm"style="height: {height}; min-height: 300px;"role="log"aria-live={isStreaming ? 'polite' : 'off'}@@ -413,13 +406,8 @@<span class="shrink-0 {getLevelClass(log.level)}">{log.level.toUpperCase()}</span>- {#if showTimestamps && log.timestamp}- <span class="ml-auto shrink-0 text-gray-500">- {formatTimestamp(log.timestamp)}- </span>- {/if}</div>- <div class="text-sm break-words whitespace-pre-wrap text-gray-300">+ <div class="whitespace-pre-wrap break-words text-sm text-gray-300">{log.message}</div></div>@@ -430,21 +418,16 @@>{#if type === 'project' && log.service}<span- class="mr-3 max-w-[120px] min-w-[120px] shrink-0 truncate text-xs font-semibold {getServiceColor(log.service)}"+ class="mr-3 min-w-[120px] max-w-[120px] shrink-0 truncate text-xs font-semibold {getServiceColor(log.service)}"title={log.service}>{log.service}</span>{/if}- {#if showTimestamps && log.timestamp}- <span class="mr-3 min-w-fit shrink-0 text-xs text-gray-500">- {formatTimestamp(log.timestamp)}- </span>- {/if}<span class="mr-2 shrink-0 text-xs {getLevelClass(log.level)} min-w-fit">{log.level.toUpperCase()}</span>- <span class="flex-1 break-words whitespace-pre-wrap text-gray-300">+ <span class="flex-1 whitespace-pre-wrap break-words text-gray-300">{log.message}</span></div>