diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-20 12:42:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 12:42:15 +0200 |
| commit | 386de7a1fbfef0c266e04f6471f9382a5d39a02f (patch) | |
| tree | 8e3f5471cd71d055e9598a32c1e235a5e9cb4cef /libpod/container_api.go | |
| parent | 9ac3a03d041161bed934ca0259fb70072b9cd8d0 (diff) | |
| parent | 524ae12977d3eb93bd8b2eac4a15c84a05a66dbb (diff) | |
| download | podman-386de7a1fbfef0c266e04f6471f9382a5d39a02f.tar.gz podman-386de7a1fbfef0c266e04f6471f9382a5d39a02f.tar.bz2 podman-386de7a1fbfef0c266e04f6471f9382a5d39a02f.zip | |
Merge pull request #7356 from vrothberg/2.0-vendor-image
[2.0] vendor c/image v5.5.2
Diffstat (limited to 'libpod/container_api.go')
| -rw-r--r-- | libpod/container_api.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index 487f75e67..9d27a65a8 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -233,6 +233,7 @@ func (c *Container) Kill(signal uint) error { // This function returns when the attach finishes. It does not hold the lock for // the duration of its runtime, only using it at the beginning to verify state. func (c *Container) Attach(streams *define.AttachStreams, keys string, resize <-chan remotecommand.TerminalSize) error { + logrus.Errorf("normal attach") if !c.batched { c.lock.Lock() if err := c.syncContainer(); err != nil { @@ -268,6 +269,7 @@ func (c *Container) Attach(streams *define.AttachStreams, keys string, resize <- // sent. // At least one of streamAttach and streamLogs must be set. func (c *Container) HTTPAttach(httpCon net.Conn, httpBuf *bufio.ReadWriter, streams *HTTPAttachStreams, detachKeys *string, cancel <-chan bool, streamAttach, streamLogs bool) (deferredErr error) { + logrus.Errorf("HTTP attach") isTerminal := false if c.config.Spec.Process != nil { isTerminal = c.config.Spec.Process.Terminal |