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

Merge pull request #15446 from cpuguy83/better_err_on_exec_err

Browse Source 
Return better errors from exec
Upstream-commit: d3198fa8c4f704a2ddd4d876003757b30a61c00c
Component: engine
This commit is contained in:
Jessie Frazelle
2015-08-12 11:13:29 -07:00
parent 8aaf7ef170 978d8e86f8
commit 60f12fa9b0
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
components/engine/api/server/exec.go
View File

@ -64,10 +64,9 @@ func (s *Server) postContainerExecStart(version version.Version, w http.Response
return err
}
var (
execName = vars["name"]
stdin io.ReadCloser
stdout io.Writer
stderr io.Writer
execName = vars["name"]
stdin, inStream io.ReadCloser
stdout, stderr, outStream io.Writer
)
execStartCheck := &types.ExecStartCheck{}
@ -76,15 +75,14 @@ func (s *Server) postContainerExecStart(version version.Version, w http.Response
}
if !execStartCheck.Detach {
var err error
// Setting up the streaming http interface.
inStream, outStream, err := hijackServer(w)
inStream, outStream, err = hijackServer(w)
if err != nil {
return err
}
defer closeStreams(inStream, outStream)
var errStream io.Writer
if _, ok := r.Header["Upgrade"]; ok {
fmt.Fprintf(outStream, "HTTP/1.1 101 UPGRADED\r\nContent-Type: application/vnd.docker.raw-stream\r\nConnection: Upgrade\r\nUpgrade: tcp\r\n\r\n")
} else {
@ -92,22 +90,16 @@ func (s *Server) postContainerExecStart(version version.Version, w http.Response
}
if !execStartCheck.Tty {
errStream = stdcopy.NewStdWriter(outStream, stdcopy.Stderr)
outStream = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
stderr = stdcopy.NewStdWriter(outStream, stdcopy.Stderr)
stdout = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
}
stdin = inStream
stdout = outStream
stderr = errStream
}
// Now run the user process in container.
if err := s.daemon.ContainerExecStart(execName, stdin, stdout, stderr); err != nil {
logrus.Errorf("Error starting exec command in container %s: %s", execName, err)
return err
fmt.Fprintf(outStream, "Error running exec in container: %v\n", err)
}
w.WriteHeader(http.StatusNoContent)
return nil
}