diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-22 03:39:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 03:39:36 -0400 |
| commit | ff31cdc5588b6ae41e4ecd578e829da90ba64346 (patch) | |
| tree | d4169ab35fc4db39f1b448a0a60f516e51e5d045 /libpod/events/logfile.go | |
| parent | 0291928abb27aceda429088eede903604a1e9bbd (diff) | |
| parent | 3fcdd0d54e5ff0a21d93f465a743ff3c1c855b56 (diff) | |
| download | podman-ff31cdc5588b6ae41e4ecd578e829da90ba64346.tar.gz podman-ff31cdc5588b6ae41e4ecd578e829da90ba64346.tar.bz2 podman-ff31cdc5588b6ae41e4ecd578e829da90ba64346.zip | |
Merge pull request #7038 from vrothberg/2.0-events-endpoint
[2.0] events fixes
Diffstat (limited to 'libpod/events/logfile.go')
| -rw-r--r-- | libpod/events/logfile.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go index 28d0dc07e..b70102450 100644 --- a/libpod/events/logfile.go +++ b/libpod/events/logfile.go @@ -63,6 +63,14 @@ func (e EventLogFile) Read(ctx context.Context, options ReadOptions) error { } }() for line := range t.Lines { + select { + case <-ctx.Done(): + // the consumer has cancelled + return nil + default: + // fallthrough + } + event, err := newEventFromJSONString(line.Text) if err != nil { return err |