diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-02 12:36:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 12:36:04 -0400 |
| commit | 22def2e2d98fd2ac4f6709bd094ee66bda9c648b (patch) | |
| tree | 7e795ae88a3df174bb7d399a115c2178ec4fd93b /libpod/events/journal_linux.go | |
| parent | c131567401bea2867d597d79cce75b99012e64fb (diff) | |
| parent | 9e4cf6ca513fa0646f33ade14955e1fc4335e176 (diff) | |
| download | podman-22def2e2d98fd2ac4f6709bd094ee66bda9c648b.tar.gz podman-22def2e2d98fd2ac4f6709bd094ee66bda9c648b.tar.bz2 podman-22def2e2d98fd2ac4f6709bd094ee66bda9c648b.zip | |
Merge pull request #6838 from mheon/fix_panic_events
Fix `system service` panic from early hangup in events
Diffstat (limited to 'libpod/events/journal_linux.go')
| -rw-r--r-- | libpod/events/journal_linux.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/events/journal_linux.go b/libpod/events/journal_linux.go index 482435038..d341ca7b5 100644 --- a/libpod/events/journal_linux.go +++ b/libpod/events/journal_linux.go @@ -3,6 +3,7 @@ package events import ( + "context" "fmt" "strconv" "time" @@ -53,7 +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 { +func (e EventJournalD) Read(ctx context.Context, options ReadOptions) error { defer close(options.EventChannel) eventOptions, err := generateEventOptions(options.Filters, options.Since, options.Until) if err != nil { |