diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-11-06 17:14:44 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-11-06 17:14:44 +0100 |
| commit | 276d68c8f54ef1b268eb5a4f5d8c35822eb77f2b (patch) | |
| tree | 5163a5c082774d8883a7e76ca9ca18dc64fc19f8 /libpod/events/journal_linux.go | |
| parent | 381fa4df875af3d2acee34d4fc1a608b2218b551 (diff) | |
| download | podman-276d68c8f54ef1b268eb5a4f5d8c35822eb77f2b.tar.gz podman-276d68c8f54ef1b268eb5a4f5d8c35822eb77f2b.tar.bz2 podman-276d68c8f54ef1b268eb5a4f5d8c35822eb77f2b.zip | |
events: make sure the write channel is always closed
in case of errors, the channel is not closed, blocking the reader
indefinitely.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1767663
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'libpod/events/journal_linux.go')
| -rw-r--r-- | libpod/events/journal_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/events/journal_linux.go b/libpod/events/journal_linux.go index 470c76959..9e6fffc29 100644 --- a/libpod/events/journal_linux.go +++ b/libpod/events/journal_linux.go @@ -54,6 +54,7 @@ func (e EventJournalD) Write(ee Event) error { // Read reads events from the journal and sends qualified events to the event channel func (e EventJournalD) Read(options ReadOptions) error { + defer close(options.EventChannel) eventOptions, err := generateEventOptions(options.Filters, options.Since, options.Until) if err != nil { return errors.Wrapf(err, "failed to generate event options") @@ -87,7 +88,6 @@ func (e EventJournalD) Read(options ReadOptions) error { if err != nil { return err } - defer close(options.EventChannel) for { if _, err := j.Next(); err != nil { return err |