Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions pkg/runtime/node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,31 @@ func (w *Worker) Logs() io.ReadCloser {

var wg sync.WaitGroup
wg.Add(2)
go func() {
defer wg.Done()
_, _ = io.Copy(writer, w.stdout)
}()
go func() {

copyStream := func(dst io.Writer, src io.Reader) {
defer wg.Done()
_, _ = io.Copy(writer, w.stderr)
}()
buf := make([]byte, 32*1024)
for {
nr, err := src.Read(buf)
if nr > 0 {
nw, werr := dst.Write(buf[0:nr])
if werr != nil || nw != nr {
return
}
}
if err != nil {
// Pipe closed or process died, stop copying
return
}
}
}

go copyStream(writer, w.stdout)
go copyStream(writer, w.stderr)

go func() {
wg.Wait()
defer writer.Close()
writer.Close()
}()

return reader
Expand Down