From 3f5e6e9c3ebb396949b091ee43b76d3303401fd3 Mon Sep 17 00:00:00 2001 From: JP Appel Date: Tue, 8 Oct 2024 15:18:58 -0400 Subject: Fix filtering of escape sequences in vtt logs --- api/api.go | 5 ++--- api/docker.go | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'api') diff --git a/api/api.go b/api/api.go index 650e3d2..b80c208 100644 --- a/api/api.go +++ b/api/api.go @@ -85,11 +85,10 @@ func VttLogs(w http.ResponseWriter, req *http.Request) { http.Error(w, "Error occured while getting logs", http.StatusInternalServerError) return } - logReader = util.NewAnsiStripper(logReader) defer logReader.Close() - // FIXME: erroring here with "Unrecognized input header: 112" - n, err := stdcopy.StdCopy(w, nil, logReader) + filteredWriter := util.NewAnsiFilterWriter(w) + n, err := stdcopy.StdCopy(filteredWriter, filteredWriter, logReader) if err != nil { Logger.Error("Error occured while writting logs to response", slog.Any("err", err), slog.Any("request", req)) Logger.Error("", slog.Int64("written", n)) diff --git a/api/docker.go b/api/docker.go index 551c818..b82b731 100644 --- a/api/docker.go +++ b/api/docker.go @@ -43,7 +43,7 @@ func vttLogs(ctx context.Context, lines uint) (io.ReadCloser, error) { opts := container.LogsOptions{ ShowStdout: true, - // ShowStderr: true, + ShowStderr: true, } if lines != 0 { opts.Tail = fmt.Sprint(lines) -- cgit v1.2.3