vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Move fifo creation to client

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-02-03 13:56:15 -08:00
parent f5fdc548e8
commit 36eb83cb99
14 changed files with 305 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

18
supervisor/add_process.go
View file

@ -1,6 +1,10 @@
package supervisor
import "time"
import (
"time"
"github.com/docker/containerd/runtime"
)
type AddProcessEvent struct {
s *Supervisor
@ -14,7 +18,11 @@ func (h *AddProcessEvent) Handle(e *Event) error {
if !ok {
return ErrContainerNotFound
}
process, err := ci.container.Exec(e.Pid, *e.ProcessSpec)
process, err := ci.container.Exec(e.Pid, *e.ProcessSpec, runtime.Stdio{
Stdin: e.Stdin,
Stdout: e.Stdout,
Stderr: e.Stderr,
})
if err != nil {
return err
}
@ -22,10 +30,6 @@ func (h *AddProcessEvent) Handle(e *Event) error {
return err
}
ExecProcessTimer.UpdateSince(start)
e.StartResponse <- StartResponse{
Stdin: process.Stdin(),
Stdout: process.Stdout(),
Stderr: process.Stderr(),
}
e.StartResponse <- StartResponse{}
return nil
}