github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add typeurl.Is to gate unmarshal

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-07-05 16:22:17 -07:00
parent 448dc0dfa8
commit c63b69672e
4 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
process.go
View File

@@ -66,7 +66,6 @@ func (p *process) Kill(ctx context.Context, s syscall.Signal) error {
}
func (p *process) Wait(ctx context.Context) (uint32, error) {
// TODO (ehazlett): add filtering for specific event
eventstream, err := p.task.client.EventService().Stream(ctx, &eventsapi.StreamEventsRequest{})
if err != nil {
return UnknownExitStatus, err
@@ -78,15 +77,15 @@ evloop:
if err != nil {
return UnknownExitStatus, err
}
v, err := typeurl.UnmarshalAny(evt.Event)
if err != nil {
return UnknownExitStatus, err
}
if e, ok := v.(*eventsapi.RuntimeEvent); ok {
if typeurl.Is(evt.Event, eventsapi.RuntimeEvent{}) {
v, err := typeurl.UnmarshalAny(evt.Event)
if err != nil {
return UnknownExitStatus, err
}
e := v.(*eventsapi.RuntimeEvent)
if e.Type != eventsapi.RuntimeEvent_EXIT {
continue evloop
}
if e.ID == p.task.containerID && e.Pid == p.pid {
return e.ExitStatus, nil
}