diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2020-07-09 13:32:20 +0200 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-07-22 14:50:47 -0400 |
| commit | 84076bf95f485bccfd9e03108fb69a1f72b42918 (patch) | |
| tree | ff7e5ac8be9598f65fa23c7b8df9bceb99dc584b /libpod/container_api.go | |
| parent | f9526cf02b76f1c006bd344d05e8a40bfe94dbe9 (diff) | |
| download | podman-84076bf95f485bccfd9e03108fb69a1f72b42918.tar.gz podman-84076bf95f485bccfd9e03108fb69a1f72b42918.tar.bz2 podman-84076bf95f485bccfd9e03108fb69a1f72b42918.zip | |
log API: add context to allow for cancelling
Add a `context.Context` to the log APIs to allow for cancelling
streaming (e.g., via `podman logs -f`). This fixes issues for
the remote API where some go routines of the server will continue
writing and produce nothing but heat and waste CPU cycles.
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
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 d19dc651b..487f75e67 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) |