summaryrefslogtreecommitdiff
path: root/libpod/container_attach_linux.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-22 13:13:50 +0200
committerGitHub <noreply@github.com>2019-07-22 13:13:50 +0200
commit3b52e4d0b5baacf5f63516c664a117a7537a075e (patch)
treeef6dc8150136e7941daf45a2e6b615dee43c7893 /libpod/container_attach_linux.go
parentd6b41eb393c154eaff79b4fdcb04c7510a6fdb20 (diff)
parentdb826d5d75630cca784bd7092eba5b06601ae27f (diff)
downloadpodman-3b52e4d0b5baacf5f63516c664a117a7537a075e.tar.gz
podman-3b52e4d0b5baacf5f63516c664a117a7537a075e.tar.bz2
podman-3b52e4d0b5baacf5f63516c664a117a7537a075e.zip
Merge pull request #3562 from baude/golangcilint3
golangci-lint round #3
Diffstat (limited to 'libpod/container_attach_linux.go')
-rw-r--r--libpod/container_attach_linux.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/libpod/container_attach_linux.go b/libpod/container_attach_linux.go
index 43dd7d579..837cbf916 100644
--- a/libpod/container_attach_linux.go
+++ b/libpod/container_attach_linux.go
@@ -88,7 +88,11 @@ func (c *Container) attachContainerSocket(resize <-chan remotecommand.TerminalSi
if err != nil {
return errors.Wrapf(err, "failed to connect to container's attach socket: %v", socketPath)
}
- defer conn.Close()
+ defer func() {
+ if err := conn.Close(); err != nil {
+ logrus.Errorf("unable to close socket: %q", err)
+ }
+ }()
// If starting was requested, start the container and notify when that's
// done.