diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-09 17:05:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-09 17:05:47 +0200 |
| commit | bc3b3b373fab58929f4583ab0b5eb529e64a54fc (patch) | |
| tree | d6a64a013d2957d676a1e74e3374350dfc2fbef0 /libpod/container_api.go | |
| parent | f86782c05293987acc750b259fa5a7fa0106b5b6 (diff) | |
| parent | d0ebea06437f05dfd42ec50e1eef2da0310b65d9 (diff) | |
| download | podman-bc3b3b373fab58929f4583ab0b5eb529e64a54fc.tar.gz podman-bc3b3b373fab58929f4583ab0b5eb529e64a54fc.tar.bz2 podman-bc3b3b373fab58929f4583ab0b5eb529e64a54fc.zip | |
Merge pull request #6916 from vrothberg/logs-fixes
log API: add context to allow for cancelling
Diffstat (limited to 'libpod/container_api.go')
| -rw-r--r-- | libpod/container_api.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index b37b05ff2..c7df9d66c 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -353,7 +353,7 @@ func (c *Container) HTTPAttach(httpCon net.Conn, httpBuf *bufio.ReadWriter, stre logOpts.WaitGroup.Wait() close(logChan) }() - if err := c.ReadLog(logOpts, logChan); err != nil { + if err := c.ReadLog(context.Background(), logOpts, logChan); err != nil { return err } logrus.Debugf("Done reading logs for container %s, %d bytes", c.ID(), logSize) |