Add "died" event

We have a new event for container 'Exited' which has been renamed to
'died'.

also removed the stream bool from the varlink endpoint for events
because it can be determined by the varlink more value.

Signed-off-by: baude <bbaude@redhat.com>

2 files changed, 9 insertions, 3 deletions

diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go
index 01f774dbd..6c53d0c62 100644
--- a/pkg/adapter/runtime_remote.go
+++ b/pkg/adapter/runtime_remote.go
@@ -763,7 +763,11 @@ func (r *LocalRuntime) JoinOrCreateRootlessPod(pod *Pod) (bool, int, error) {
 
 // Events monitors libpod/podman events over a varlink connection
 func (r *LocalRuntime) Events(c *cliconfig.EventValues) error {
-	reply, err := iopodman.GetEvents().Send(r.Conn, uint64(varlink.More), c.Filter, c.Since, c.Stream, c.Until)
+	var more uint64
+	if c.Stream {
+		more = uint64(varlink.More)
+	}
+	reply, err := iopodman.GetEvents().Send(r.Conn, more, c.Filter, c.Since, c.Until)
 	if err != nil {
 		return errors.Wrapf(err, "unable to obtain events")
 	}
diff --git a/pkg/varlinkapi/events.go b/pkg/varlinkapi/events.go
index d3fe3d65f..47c628ead 100644
--- a/pkg/varlinkapi/events.go
+++ b/pkg/varlinkapi/events.go
@@ -10,13 +10,15 @@ import (
 )
 
 // GetEvents is a remote endpoint to get events from the event log
-func (i *LibpodAPI) GetEvents(call iopodman.VarlinkCall, filter []string, since string, stream bool, until string) error {
+func (i *LibpodAPI) GetEvents(call iopodman.VarlinkCall, filter []string, since string, until string) error {
 	var (
 		fromStart   bool
 		eventsError error
 		event       *events.Event
+		stream      bool
 	)
 	if call.WantsMore() {
+		stream = true
 		call.Continues = true
 	}
 	filters, err := shared.GenerateEventOptions(filter, since, until)
@@ -52,5 +54,5 @@ func (i *LibpodAPI) GetEvents(call iopodman.VarlinkCall, filter []string, since
 			break
 		}
 	}
-	return call.ReplyGetEvents(iopodman.Event{})
+	return nil
 }