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

Add exec process log support

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2015-12-15 11:43:51 -08:00
parent db181c6132
commit ec31245f54
9 changed files with 181 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/grpc/server/server.go
View file

@ -76,6 +76,10 @@ func (s *apiServer) AddProcess(ctx context.Context, r *types.AddProcessRequest)
e := containerd.NewEvent(containerd.AddProcessEventType)
e.ID = r.Id
e.Process = process
e.Console = r.Console
e.Stdin = r.Stdin
e.Stdout = r.Stdout
e.Stderr = r.Stderr
s.sv.SendEvent(e)
if err := <-e.Err; err != nil {
return nil, err
@ -220,7 +224,7 @@ func (s *apiServer) Events(r *types.EventsRequest, stream types.API_EventsServer
defer s.sv.Unsubscribe(events)
for evt := range events {
switch evt.Type {
case containerd.ExitEventType:
case containerd.ExitEventType, containerd.ExecExitEventType:
ev := &types.Event{
Type: "exit",
Id: evt.ID,