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

Merge pull request #3983 from AkihiroSuda/ctr-events-ignore-err

Browse Source 
ctr events: do not exit on an error
This commit is contained in:
Phil Estes 2020-01-29 15:05:48 +02:00 committed by GitHub
commit 07de4eccf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/ctr/commands/events/events.go
View File

@ -22,6 +22,7 @@ import (
"github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
"github.com/containerd/containerd/log"
"github.com/containerd/typeurl" "github.com/containerd/typeurl"
"github.com/urfave/cli" "github.com/urfave/cli"
@ -54,11 +55,13 @@ var Command = cli.Command{
if e.Event != nil { if e.Event != nil {
v, err := typeurl.UnmarshalAny(e.Event) v, err := typeurl.UnmarshalAny(e.Event)
if err != nil { if err != nil {
return err log.G(ctx).WithError(err).Warn("cannot unmarshal an event from Any")
continue
} }
out, err = json.Marshal(v) out, err = json.Marshal(v)
if err != nil { if err != nil {
return err log.G(ctx).WithError(err).Warn("cannot marshal Any into JSON")
continue
} }
} }
if _, err := fmt.Println( if _, err := fmt.Println(