diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-26 07:09:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-26 07:09:17 -0700 |
| commit | 60b009af4ef1415b83e0419ba41381912693ab86 (patch) | |
| tree | 3927f6c2f9a3bfa97c3fe5ebefaaf1f1d49645ea /pkg/adapter | |
| parent | 94406bcce935bf12c16e7e7762e9796fa0363f91 (diff) | |
| parent | e730fc609347ddef217418dd6b0a9da5f671ba89 (diff) | |
| download | podman-60b009af4ef1415b83e0419ba41381912693ab86.tar.gz podman-60b009af4ef1415b83e0419ba41381912693ab86.tar.bz2 podman-60b009af4ef1415b83e0419ba41381912693ab86.zip | |
Merge pull request #2758 from baude/eventsDied
Add "died" event
Diffstat (limited to 'pkg/adapter')
| -rw-r--r-- | pkg/adapter/runtime_remote.go | 6 |
1 files changed, 5 insertions, 1 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") } |