Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ func client(addr string, args []string) int {
code = 0
}

// flush any buffered stdout/stderr before reporting the exit code
outw.Close()
errw.Close()

err = enc.Encode(&msg{Name: "exit", Exit: code})
if err != nil {
enc.Encode(&msg{Name: "error", Error: fmt.Sprintf("cannot detect exit code: %v", makeCmdLine(args))})
Expand Down
23 changes: 22 additions & 1 deletion util.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,30 @@ func (e *msgEncoder) Encode(v interface{}) error {
return e.enc.Encode(v)
}

// msgWriter is an io.WriteCloser whose Close blocks until every byte written
// has been encoded, so callers can flush all output before sending a final
// message such as the exit code.
type msgWriter struct {
w *io.PipeWriter
done chan struct{}
once sync.Once
}

func (mw *msgWriter) Write(p []byte) (int, error) {
return mw.w.Write(p)
}

func (mw *msgWriter) Close() error {
err := mw.w.Close()
mw.once.Do(func() { <-mw.done })
return err
}

func msgWrite(enc *msgEncoder, typ string) io.WriteCloser {
r, w := io.Pipe()
done := make(chan struct{})
go func() {
defer close(done)
defer r.Close()
var b [4096]byte
for {
Expand All @@ -51,7 +72,7 @@ func msgWrite(enc *msgEncoder, typ string) io.WriteCloser {
}
}
}()
return w
return &msgWriter{w: w, done: done}
}

func makeCmdLine(args []string) string {
Expand Down
Loading