From 85fb766d878dc132b500c4828b0faa57482316af Mon Sep 17 00:00:00 2001
From: George Dumitrescu <george@dumitres.co>
Date: Wed, 1 Apr 2026 14:26:46 +0300
Subject: [PATCH] fix: remove duplicate queue log streaming handler, delegate
 to streamUnitLogs

---
 CHANGELOG.md          |  1 +
 docs/changelog.md     |  1 +
 internal/ui/server.go | 43 +------------------------------------------
 3 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52b828c..b24189b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ Lerd uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Fixed
 
 - **PHP FPM fails to start on fresh installs** — the shared hosts file (`~/.local/share/lerd/hosts`) is bind-mounted into every PHP-FPM container. If no site had ever been linked, the file did not exist and podman refused to start the container with `statfs: no such file or directory`. `WriteFPMQuadlet` now ensures the file is created before the container is started.
+- **Queue log streaming was a stale duplicate of the shared implementation** — the `/api/queue/<site>/logs` SSE handler had its own inline copy of the log streaming logic instead of calling the shared `streamUnitLogs` helper used by every other worker (horizon, schedule, reverb, stripe). The duplicate is removed.
 
 ---
 
diff --git a/docs/changelog.md b/docs/changelog.md
index 8248b9d..8d5d2c9 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -12,6 +12,7 @@ Lerd uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Fixed
 
 - **PHP FPM fails to start on fresh installs** — the shared hosts file (`~/.local/share/lerd/hosts`) is bind-mounted into every PHP-FPM container. If no site had ever been linked, the file did not exist and podman refused to start the container with `statfs: no such file or directory`. `WriteFPMQuadlet` now ensures the file is created before the container is started.
+- **Queue log streaming was a stale duplicate of the shared implementation** — the `/api/queue/<site>/logs` SSE handler had its own inline copy of the log streaming logic instead of calling the shared `streamUnitLogs` helper used by every other worker (horizon, schedule, reverb, stripe). The duplicate is removed.
 
 ---
 
diff --git a/internal/ui/server.go b/internal/ui/server.go
index c406406..b86c04b 100644
--- a/internal/ui/server.go
+++ b/internal/ui/server.go
@@ -1577,48 +1577,7 @@ func handleQueueLogs(w http.ResponseWriter, r *http.Request) {
 		http.NotFound(w, r)
 		return
 	}
-	unit := "lerd-queue-" + parts[0]
-
-	flusher, ok := w.(http.Flusher)
-	if !ok {
-		http.Error(w, "streaming not supported", http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "text/event-stream")
-	w.Header().Set("Cache-Control", "no-cache")
-	w.Header().Set("Connection", "keep-alive")
-	w.Header().Set("X-Accel-Buffering", "no")
-
-	pr, pw := io.Pipe()
-	cmd := exec.CommandContext(r.Context(), "journalctl", "--user", "-u", unit, "-f", "--no-pager", "-n", "100", "--output=cat")
-	cmd.Stdout = pw
-	cmd.Stderr = pw
-
-	if err := cmd.Start(); err != nil {
-		fmt.Fprintf(w, "data: error starting logs: %s\n\n", err.Error())
-		flusher.Flush()
-		return
-	}
-
-	go func() {
-		cmd.Wait() //nolint:errcheck
-		pw.Close()
-	}()
-
-	scanner := bufio.NewScanner(pr)
-	for scanner.Scan() {
-		line := scanner.Text()
-		escaped := strings.ReplaceAll(line, "\\", "\\\\")
-		fmt.Fprintf(w, "data: %s\n\n", escaped)
-		flusher.Flush()
-		if r.Context().Err() != nil {
-			break
-		}
-	}
-	if cmd.Process != nil {
-		cmd.Process.Kill() //nolint:errcheck
-	}
+	streamUnitLogs(w, r, "lerd-queue-"+parts[0])
 }
 
 // SettingsResponse is the response for GET /api/settings.