From 4d746a6cf4d300db751c823344395969a6c1da46 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Fri, 5 Aug 2016 19:23:54 +0100
Subject: [PATCH] log container id in attach/exec errors

---
 probe/docker/controls.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/probe/docker/controls.go b/probe/docker/controls.go
index 9241ad385..7d79c7156 100644
--- a/probe/docker/controls.go
+++ b/probe/docker/controls.go
@@ -89,13 +89,13 @@ func (r *registry) attachContainer(containerID string, req xfer.Request) xfer.Re
 	}
 	pipe.OnClose(func() {
 		if err := cw.Close(); err != nil {
-			log.Errorf("Error closing attachment: %v", err)
+			log.Errorf("Error closing attachment to container %s: %v", containerID, err)
 			return
 		}
 	})
 	go func() {
 		if err := cw.Wait(); err != nil {
-			log.Errorf("Error waiting on exec: %v", err)
+			log.Errorf("Error waiting on attachment to container %s: %v", containerID, err)
 		}
 		pipe.Close()
 	}()
@@ -135,13 +135,13 @@ func (r *registry) execContainer(containerID string, req xfer.Request) xfer.Resp
 	}
 	pipe.OnClose(func() {
 		if err := cw.Close(); err != nil {
-			log.Errorf("Error closing exec: %v", err)
+			log.Errorf("Error closing exec in container %s: %v", containerID, err)
 			return
 		}
 	})
 	go func() {
 		if err := cw.Wait(); err != nil {
-			log.Errorf("Error waiting on exec: %v", err)
+			log.Errorf("Error waiting on exec in container %s: %v", containerID, err)
 		}
 		pipe.Close()
 	}()