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/logfile.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/logfile.go')
-rw-r--r-- | libpod/events/logfile.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go index 4b65b0ad0..93e6fa3c9 100644 --- a/libpod/events/logfile.go +++ b/libpod/events/logfile.go @@ -41,6 +41,7 @@ func (e EventLogFile) Write(ee Event) error { // Reads from the log file func (e EventLogFile) Read(options ReadOptions) error { + defer close(options.EventChannel) eventOptions, err := generateEventOptions(options.Filters, options.Since, options.Until) if err != nil { return errors.Wrapf(err, "unable to generate event options") @@ -68,7 +69,6 @@ func (e EventLogFile) Read(options ReadOptions) error { options.EventChannel <- event } } - close(options.EventChannel) return nil } |