faas-rs/faasd
1
0
Fork 0
mirror of https://github.com/openfaas/faasd.git synced 2025-06-09 00:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce logging from log streaming command

Browse Source 
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (OpenFaaS Ltd) 2025-01-21 12:58:00 +00:00
parent a8b61f2086
commit 4ab5f60b9d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/logs/requestor.go
View File

@ -58,10 +58,10 @@ func (r *requester) Query(ctx context.Context, req logs.Request) (<-chan logs.Me
// buildCmd reeturns the equivalent of // buildCmd reeturns the equivalent of
// //
// journalctl -t <namespace>:<name> \ // journalctl -t <namespace>:<name> \
// --output=json \ // --output=json \
// --since=<timestamp> \ // --since=<timestamp> \
// <--follow> \ // <--follow> \
func buildCmd(ctx context.Context, req logs.Request) *exec.Cmd { func buildCmd(ctx context.Context, req logs.Request) *exec.Cmd {
// // set the cursor position based on req, default to 5m // // set the cursor position based on req, default to 5m
since := time.Now().Add(-5 * time.Minute) 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 // will ensure `out` is closed and all related resources cleaned up
go func() { go func() {
err := cmd.Wait() if err := cmd.Wait(); err != nil {
log.Println("wait result", err) log.Printf("journalctl exited with error: %s", err)
}
}() }()
defer func() { defer func() {
log.Println("closing journal stream")
close(msgs) close(msgs)
}() }()
@ -176,7 +176,6 @@ func parseEntry(entry map[string]string) (logs.Message, error) {
} }
func logErrOut(out io.ReadCloser) { func logErrOut(out io.ReadCloser) {
defer log.Println("stderr closed")
defer out.Close() defer out.Close()
io.Copy(log.Writer(), out) io.Copy(log.Writer(), out)