From 4ab5f60b9dec1f572d81f690ba568e5eb0e0c024 Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Tue, 21 Jan 2025 12:58:00 +0000 Subject: [PATCH] Reduce logging from log streaming command Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- pkg/logs/requestor.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkg/logs/requestor.go b/pkg/logs/requestor.go index 42ba5dca..13a052cf 100644 --- a/pkg/logs/requestor.go +++ b/pkg/logs/requestor.go @@ -58,10 +58,10 @@ func (r *requester) Query(ctx context.Context, req logs.Request) (<-chan logs.Me // buildCmd reeturns the equivalent of // -// journalctl -t : \ -// --output=json \ -// --since= \ -// <--follow> \ +// journalctl -t : \ +// --output=json \ +// --since= \ +// <--follow> \ func buildCmd(ctx context.Context, req logs.Request) *exec.Cmd { // // set the cursor position based on req, default to 5m since := time.Now().Add(-5 * time.Minute) @@ -105,12 +105,12 @@ func streamLogs(ctx context.Context, cmd *exec.Cmd, out io.ReadCloser, msgs chan // will ensure `out` is closed and all related resources cleaned up go func() { - err := cmd.Wait() - log.Println("wait result", err) + if err := cmd.Wait(); err != nil { + log.Printf("journalctl exited with error: %s", err) + } }() defer func() { - log.Println("closing journal stream") close(msgs) }() @@ -176,7 +176,6 @@ func parseEntry(entry map[string]string) (logs.Message, error) { } func logErrOut(out io.ReadCloser) { - defer log.Println("stderr closed") defer out.Close() io.Copy(log.Writer(), out)