diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-25 12:20:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 12:20:39 -0700 |
| commit | 01e79477ca75df54836944a94eb4840c9e9f49e1 (patch) | |
| tree | 8b76672f2a4e83b0c8334132dca92e3b1279ba14 /pkg/varlinkapi | |
| parent | e900e95f9aa6a22eeef9f78573dfb88df2f10d49 (diff) | |
| parent | 7bf7c177ab3f67d5de1689842204c258fca083e4 (diff) | |
| download | podman-01e79477ca75df54836944a94eb4840c9e9f49e1.tar.gz podman-01e79477ca75df54836944a94eb4840c9e9f49e1.tar.bz2 podman-01e79477ca75df54836944a94eb4840c9e9f49e1.zip | |
Merge pull request #2850 from baude/eventsjournald
journald event logging
Diffstat (limited to 'pkg/varlinkapi')
| -rw-r--r-- | pkg/varlinkapi/events.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkg/varlinkapi/events.go b/pkg/varlinkapi/events.go index 1e5696fbe..f9a9d9321 100644 --- a/pkg/varlinkapi/events.go +++ b/pkg/varlinkapi/events.go @@ -6,7 +6,6 @@ import ( "fmt" "time" - "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/cmd/podman/varlink" "github.com/containers/libpod/libpod/events" ) @@ -23,19 +22,16 @@ func (i *LibpodAPI) GetEvents(call iopodman.VarlinkCall, filter []string, since stream = true call.Continues = true } - filters, err := shared.GenerateEventOptions(filter, since, until) - if err != nil { - return call.ReplyErrorOccurred(err.Error()) - } if len(since) > 0 || len(until) > 0 { fromStart = true } eventChannel := make(chan *events.Event) go func() { - eventsError = i.Runtime.Events(fromStart, stream, filters, eventChannel) + readOpts := events.ReadOptions{FromStart: fromStart, Stream: stream, Filters: filter, EventChannel: eventChannel} + eventsError = i.Runtime.Events(readOpts) }() if eventsError != nil { - return call.ReplyErrorOccurred(err.Error()) + return call.ReplyErrorOccurred(eventsError.Error()) } for { event = <-eventChannel |