From 0d3df71e37b3a34cd31c1ff6c7723c5ac7e4d586 Mon Sep 17 00:00:00 2001
From: Matt Jaffee <jaffee@MacBook-Pro.local>
Date: Sun, 6 May 2018 20:12:23 -0700
Subject: [PATCH] add URI argument to InternalClient.SendMessage

passing values through context is error prone and usually bad practice.
---
 client.go | 6 +++---
 server.go | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/client.go b/client.go
index eee1a3a9c..ecfae5801 100644
--- a/client.go
+++ b/client.go
@@ -1098,13 +1098,13 @@ func (c *InternalHTTPClient) RowAttrDiff(ctx context.Context, index, frame strin
 }
 
 // SendMessage posts a message synchronously.
-func (c *InternalHTTPClient) SendMessage(ctx context.Context, pb proto.Message) error {
+func (c *InternalHTTPClient) SendMessage(ctx context.Context, uri *URI, pb proto.Message) error {
 	msg, err := MarshalMessage(pb)
 	if err != nil {
 		return fmt.Errorf("marshaling message: %v", err)
 	}
 
-	u := uriPathToURL(ctx.Value("uri").(*URI), "/cluster/message")
+	u := uriPathToURL(uri, "/cluster/message")
 	req, err := http.NewRequest("POST", u.String(), bytes.NewReader(msg))
 	req.Header.Set("Content-Type", "application/x-protobuf")
 	req.Header.Set("User-Agent", "pilosa/"+Version)
@@ -1337,5 +1337,5 @@ type InternalClient interface {
 	BlockData(ctx context.Context, index, frame, view string, slice uint64, block int) ([]uint64, []uint64, error)
 	ColumnAttrDiff(ctx context.Context, index string, blks []AttrBlock) (map[uint64]map[string]interface{}, error)
 	RowAttrDiff(ctx context.Context, index, frame string, blks []AttrBlock) (map[uint64]map[string]interface{}, error)
-	SendMessage(ctx context.Context, pb proto.Message) error
+	SendMessage(ctx context.Context, uri *URI, pb proto.Message) error
 }
diff --git a/server.go b/server.go
index 7617d7e69..52999b1c5 100644
--- a/server.go
+++ b/server.go
@@ -536,15 +536,15 @@ func (s *Server) ReceiveMessage(pb proto.Message) error {
 func (s *Server) SendSync(pb proto.Message) error {
 	var eg errgroup.Group
 	for _, node := range s.Cluster.Nodes {
+		node := node
 		s.logger.Printf("SendSync to: %s", node.URI)
 		// Don't forward the message to ourselves.
 		if s.URI == node.URI {
 			continue
 		}
 
-		ctx := context.WithValue(context.Background(), "uri", &node.URI)
 		eg.Go(func() error {
-			return s.defaultClient.SendMessage(ctx, pb)
+			return s.defaultClient.SendMessage(context.Background(), &node.URI, pb)
 		})
 	}
 
@@ -559,8 +559,7 @@ func (s *Server) SendAsync(pb proto.Message) error {
 // SendTo represents an implementation of Broadcaster.
 func (s *Server) SendTo(to *Node, pb proto.Message) error {
 	s.logger.Printf("SendTo: %s", to.URI)
-	ctx := context.WithValue(context.Background(), "uri", &to.URI)
-	return s.defaultClient.SendMessage(ctx, pb)
+	return s.defaultClient.SendMessage(context.Background(), &to.URI, pb)
 }
 
 // Server implements StatusHandler.