3 files changed, 6 insertions, 11 deletions
diff --git a/weed/messaging/client/client.go b/weed/messaging/client/client.go
index 3f6d1ca53..910fd02e9 100644
--- a/weed/messaging/client/client.go
+++ b/weed/messaging/client/client.go
@@ -23,12 +23,12 @@ func NewMessagingClient(bootstrapBrokers []string) (*MessagingClient, error) {
 		return nil, err
 	}
 
+	util.OnInterrupt(func() {
+		grpcConnection.Close()
+	})
+
 	return &MessagingClient{
 		bootstrapBrokers: bootstrapBrokers,
 		grpcConnection:   grpcConnection,
 	}, nil
 }
-
-func (mc *MessagingClient) Shutdown() {
-	mc.grpcConnection.Close()
-}
diff --git a/weed/messaging/client/publisher.go b/weed/messaging/client/publisher.go
index d4c0f798a..238b67783 100644
--- a/weed/messaging/client/publisher.go
+++ b/weed/messaging/client/publisher.go
@@ -69,8 +69,7 @@ func (p *Publisher) Publish(m *messaging_pb.RawData) error {
 
 }
 
-func (p *Publisher) Shutdown() {
-
-	p.publishClient.CloseSend()
+func (p *Publisher) Close() error {
 
+	return p.publishClient.CloseSend()
 }
diff --git a/weed/messaging/client/subscriber.go b/weed/messaging/client/subscriber.go
index 0b0cf58f9..407cd4ac6 100644
--- a/weed/messaging/client/subscriber.go
+++ b/weed/messaging/client/subscriber.go
@@ -59,7 +59,3 @@ func (s *Subscriber) Subscribe(processFn func(m *messaging_pb.Message)) error {
 		processFn(resp.Data)
 	}
 }
-
-func (s *Subscriber) Shutdown() {
-	s.subscriberClient.CloseSend()
-}