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/adapter | |
| 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/adapter')
| -rw-r--r-- | pkg/adapter/runtime.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkg/adapter/runtime.go b/pkg/adapter/runtime.go index ca9678265..790ed5c89 100644 --- a/pkg/adapter/runtime.go +++ b/pkg/adapter/runtime.go @@ -5,6 +5,7 @@ package adapter import ( "bufio" "context" + "github.com/containers/libpod/cmd/podman/shared" "io" "io/ioutil" "os" @@ -17,7 +18,6 @@ import ( "github.com/containers/image/types" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/libpodruntime" - "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/events" "github.com/containers/libpod/libpod/image" @@ -322,10 +322,6 @@ func (r *LocalRuntime) Events(c *cliconfig.EventValues) error { fromStart bool eventsError error ) - options, err := shared.GenerateEventOptions(c.Filter, c.Since, c.Until) - if err != nil { - return errors.Wrapf(err, "unable to generate event options") - } tmpl, err := template.New("events").Parse(c.Format) if err != nil { return err @@ -335,7 +331,8 @@ func (r *LocalRuntime) Events(c *cliconfig.EventValues) error { } eventChannel := make(chan *events.Event) go func() { - eventsError = r.Runtime.Events(fromStart, c.Stream, options, eventChannel) + readOpts := events.ReadOptions{FromStart: fromStart, Stream: c.Stream, Filters: c.Filter, EventChannel: eventChannel, Since: c.Since, Until: c.Until} + eventsError = r.Runtime.Events(readOpts) }() if eventsError != nil { |