beam/examples/beamsh: 'exec' adds 'fromcmd' field to its output

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
This commit is contained in:
Solomon Hykes 2014-03-28 15:37:21 -07:00
parent b27e7baa02
commit 11c2feae5b

View file

@ -634,8 +634,8 @@ func GetHandler(name string) Handler {
} }
cmd.Stderr = errW cmd.Stderr = errW
cmd.Stdin = os.Stdin cmd.Stdin = os.Stdin
beam.Send(out, data.Empty().Set("cmd", "log", "stdout").Bytes(), outR) beam.Send(out, data.Empty().Set("cmd", "log", "stdout").Set("fromcmd", args...).Bytes(), outR)
beam.Send(out, data.Empty().Set("cmd", "log", "stderr").Bytes(), errR) beam.Send(out, data.Empty().Set("cmd", "log", "stderr").Set("fromcmd", args...).Bytes(), errR)
execErr := cmd.Run() execErr := cmd.Run()
var status string var status string
if execErr != nil { if execErr != nil {