Skip to content

Modern Docker Management, Designed for Everyone

fix: project logs not streaming (#1909)

Kyle Mendelle13b96f0325b
diff --git a/backend/internal/api/ws_handler.go b/backend/internal/api/ws_handler.go
index 056ae947a..e81a6d61f 100644
--- a/backend/internal/api/ws_handler.go
+++ b/backend/internal/api/ws_handler.go
@@ -5,6 +5,7 @@ import (
"context"
"encoding/csv"
"encoding/json"
+ "errors"
"fmt"
"io"
"log/slog"
@@ -314,7 +315,29 @@ func (h *WebSocketHandler) startProjectLogHub(projectID, format string, batched,
lines := make(chan string, 256)
go func(ctx context.Context) {
defer close(lines)
- _ = h.projectService.StreamProjectLogs(ctx, projectID, lines, follow, tail, since, timestamps)
+ if err := h.projectService.StreamProjectLogs(ctx, projectID, lines, follow, tail, since, timestamps); err != nil {
+ if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
+ return
+ }
+
+ slog.Warn("project log stream failed", "projectID", projectID, "error", err)
+
+ if format == "json" {
+ msg := ws.LogMessage{
+ Seq: ls.seq.Add(1),
+ Level: "error",
+ Message: "Failed to stream project logs: " + err.Error(),
+ Service: "arcane",
+ Timestamp: ws.NowRFC3339(),
+ }
+ if b, merr := json.Marshal(msg); merr == nil {
+ ls.hub.Broadcast(b)
+ }
+ return
+ }
+
+ ls.hub.Broadcast([]byte("Failed to stream project logs: " + err.Error()))
+ }
}(ctx)
if format == "json" {
diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.go
index 5296314b7..785e6aeee 100644
--- a/backend/internal/services/project_service.go
+++ b/backend/internal/services/project_service.go
@@ -1956,7 +1956,7 @@ func (s *ProjectService) StreamProjectLogs(ctx context.Context, projectID string
// Writer goroutine: compose logs -> pipe
go func() {
// since/timestamps not currently supported by ComposeLogs helper; follow/tail are used.
- err := projects.ComposeLogs(ctx, proj.Name, pw, follow, tail)
+ err := projects.ComposeLogs(ctx, normalizeComposeProjectName(proj.Name), pw, follow, tail)
_ = pw.Close()
done <- err
}()
diff --git a/frontend/src/lib/components/logs/log-viewer.svelte b/frontend/src/lib/components/logs/log-viewer.svelte
index 23bc8a62b..bb8106b44 100644
--- a/frontend/src/lib/components/logs/log-viewer.svelte
+++ b/frontend/src/lib/components/logs/log-viewer.svelte
@@ -145,6 +145,7 @@
}
const humanType = $derived(type === 'project' ? m.project() : m.container());
+ const selectedTargetId = $derived(type === 'project' ? projectId : containerId);
function buildWebSocketEndpoint(path: string): string {
const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
@@ -152,8 +153,7 @@
}
async function buildLogWsEndpoint(): Promise<string> {
- const currentEnv = environmentStore.selected;
- const envId = currentEnv?.id || 'local';
+ const envId = await environmentStore.getCurrentEnvironmentId();
const basePath =
type === 'project'
? `/api/environments/${envId}/ws/projects/${projectId}/logs`
@@ -432,7 +432,7 @@
>
{#if logs.length === 0}
<div class="p-4 text-center text-gray-500">
- {#if !containerId}
+ {#if !selectedTargetId}
{m.log_viewer_no_selection({ type: humanType })}
{:else if !isStreaming}
{m.log_viewer_no_logs_available()}
diff --git a/tests/spec/project.spec.ts b/tests/spec/project.spec.ts
index 6ae2bd013..6fbc1bcb4 100644
--- a/tests/spec/project.spec.ts
+++ b/tests/spec/project.spec.ts
@@ -584,6 +584,13 @@ test.describe("Project Detail Page", () => {
await expect(page.getByText(/Real-time project logs/i)).toBeVisible();
await expect(page.getByRole("button", { name: /^(Start|Stop)$/i })).toBeVisible();
await expect(page.getByRole("button", { name: "Clear", exact: true })).toBeVisible();
+
+ const startButton = page.getByRole("button", { name: "Start", exact: true });
+ if ((await startButton.count()) > 0) {
+ await startButton.click();
+ }
+
+ await expect(page.getByText(/No project selected/i)).not.toBeVisible();
} else {
await expect(logsTab).toBeEnabled();
}