p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 3a2b31a30b49f02f6043be5790fd2a123c2c5eae
Component: engine
This commit is contained in:
Solomon Hykes
2014-03-28 15:37:21 -07:00
parent ab1a9fa4e1
commit 609fa308ff
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/pkg/beam/examples/beamsh/beamsh.go
View File

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