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 /pkg/domain/infra | |
| 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 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 596fc2cc1..8909f831d 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -924,7 +924,7 @@ func (ic *ContainerEngine) ContainerLogs(ctx context.Context, containers []strin } logChannel := make(chan *logs.LogLine, chSize) - if err := ic.Libpod.Log(ctrs, logOpts, logChannel); err != nil { + if err := ic.Libpod.Log(ctx, ctrs, logOpts, logChannel); err != nil { return err } |