summaryrefslogtreecommitdiff
path: root/libpod/events/config.go
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2020-07-01 16:21:57 -0400
committerMatthew Heon <matthew.heon@pm.me>2020-07-02 09:57:39 -0400
commit9e4cf6ca513fa0646f33ade14955e1fc4335e176 (patch)
tree9c820378fb4e2d0873ca24da5766691ffc4b6ccd /libpod/events/config.go
parent1a1e3f4b24e6f856a5c2e16da0cc34a8191c9403 (diff)
downloadpodman-9e4cf6ca513fa0646f33ade14955e1fc4335e176.tar.gz
podman-9e4cf6ca513fa0646f33ade14955e1fc4335e176.tar.bz2
podman-9e4cf6ca513fa0646f33ade14955e1fc4335e176.zip
Fix `system service` panic from early hangup in events
We weren't actually halting the goroutine that sent events, so it would continue sending even when the channel closed (the most notable cause being early hangup - e.g. Control-c on a curl session). Use a context to cancel the events goroutine and stop sending events. Fixes #6805 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/events/config.go')
-rw-r--r--libpod/events/config.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/events/config.go b/libpod/events/config.go
index 8fe551c5d..c34408e63 100644
--- a/libpod/events/config.go
+++ b/libpod/events/config.go
@@ -1,6 +1,7 @@
package events
import (
+ "context"
"time"
"github.com/pkg/errors"
@@ -52,7 +53,7 @@ type Eventer interface {
// Write an event to a backend
Write(event Event) error
// Read an event from the backend
- Read(options ReadOptions) error
+ Read(ctx context.Context, options ReadOptions) error
// String returns the type of event logger
String() string
}