From 2950f77870e38da69350d9d7876674c09c3a7bf7 Mon Sep 17 00:00:00 2001
From: Stephen J Day <stephen.day@docker.com>
Date: Fri, 29 Jul 2016 18:05:36 -0700
Subject: [PATCH] agent: shutdown connection on node stop

Signed-off-by: Stephen J Day <stephen.day@docker.com>
---
 agent/node.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/agent/node.go b/agent/node.go
index 6de6e57d26..8876ead9c0 100644
--- a/agent/node.go
+++ b/agent/node.go
@@ -339,6 +339,7 @@ func (n *Node) Stop(ctx context.Context) error {
 			return ctx.Err()
 		default:
 			close(n.stopped)
+			n.setControlSocket(nil)
 			// recurse and wait for closure
 			return n.Stop(ctx)
 		}
@@ -430,7 +431,9 @@ func (n *Node) CertificateRequested() <-chan struct{} {
 func (n *Node) setControlSocket(conn *grpc.ClientConn) {
 	n.Lock()
 	if n.conn != nil {
-		n.conn.Close()
+		if err := n.conn.Close(); err != nil {
+			log.L.WithError(err).Error("closing grpc connection failed")
+		}
 	}
 	n.conn = conn
 	n.connCond.Broadcast()