Skip to content

Commit

Permalink
Reduce logging from log streaming command
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
  • Loading branch information
alexellis committed Jan 21, 2025
1 parent a8b61f2 commit 4ab5f60
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions pkg/logs/requestor.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ func (r *requester) Query(ctx context.Context, req logs.Request) (<-chan logs.Me

// buildCmd reeturns the equivalent of
//
// journalctl -t <namespace>:<name> \
// --output=json \
// --since=<timestamp> \
// <--follow> \
// journalctl -t <namespace>:<name> \
// --output=json \
// --since=<timestamp> \
// <--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)
Expand Down Expand Up @@ -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)
}()

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 4ab5f60

Please sign in to comment.