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

Move to a single Event type

Browse source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2017-02-06 08:46:37 -08:00
parent 8fbdf1c0d7
commit 31f26fed18
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmd/ctr/run.go
View file

@ -50,8 +50,8 @@ var runCommand = cli.Command{
}
defer nec.Close()
evCh := make(chan *execEvents.ContainerExitEvent, 64)
sub, err := nec.Subscribe(execEvents.ContainersEventsSubjectSubscriber, func(e *execEvents.ContainerExitEvent) {
evCh := make(chan *execEvents.ContainerEvent, 64)
sub, err := nec.Subscribe(execEvents.ContainersEventsSubjectSubscriber, func(e *execEvents.ContainerEvent) {
evCh <- e
})
if err != nil {
@ -118,8 +118,8 @@ var runCommand = cli.Command{
break eventLoop
}
if e.ID == cr.Container.ID && e.PID == cr.InitProcess.Pid {
ec = e.StatusCode
if e.ID == cr.Container.ID && e.Pid == cr.InitProcess.Pid {
ec = e.ExitStatus
break eventLoop
}
case <-time.After(1 * time.Second):