nsqadmin: work-around bug for raw ipv6 addresses

nsqadmin/http.go

@@ -332,6 +332,13 @@ func (s *httpServer) nodesHandler(w http.ResponseWriter, req *http.Request, ps h
 		messages = append(messages, pe.Error())
 	}
 
+	for _, producer := range producers {
+		// Assume it is an ipv6 address if a colon is in it
+		if strings.Contains(producer.BroadcastAddress, ":") {
+			producer.BroadcastAddress = fmt.Sprintf("[%s]", producer.BroadcastAddress)
+		}
+	}
+
 	return struct {
 		Nodes   clusterinfo.Producers `json:"nodes"`
 		Message string                `json:"message"`
@@ -354,6 +361,13 @@ func (s *httpServer) nodeHandler(w http.ResponseWriter, req *http.Request, ps ht
 		messages = append(messages, pe.Error())
 	}
 
+	for _, producer := range producers {
+		// Assume it is an ipv6 address if a colon is in it
+		if strings.Contains(producer.BroadcastAddress, ":") {
+			producer.BroadcastAddress = fmt.Sprintf("[%s]", producer.BroadcastAddress)
+		}
+	}
+
 	producer := producers.Search(node)
 	if producer == nil {
 		return nil, http_api.Err{404, "NODE_NOT_FOUND"}
@@ -641,6 +655,14 @@ func (s *httpServer) counterHandler(w http.ResponseWriter, req *http.Request, ps
 		s.ctx.nsqadmin.logf(LOG_WARN, "%s", err)
 		messages = append(messages, pe.Error())
 	}
+
+	for _, producer := range producers {
+		// Assume it is an ipv6 address if a colon is in it
+		if strings.Contains(producer.BroadcastAddress, ":") {
+			producer.BroadcastAddress = fmt.Sprintf("[%s]", producer.BroadcastAddress)
+		}
+	}
+
 	_, channelStats, err := s.ci.GetNSQDStats(producers, "", "", false)
 	if err != nil {
 		pe, ok := err.(clusterinfo.PartialErr)

nsqlookupd/http.go

@@ -121,6 +121,7 @@ func (s *httpServer) doLookup(w http.ResponseWriter, req *http.Request, ps httpr
 	producers := s.ctx.nsqlookupd.DB.FindProducers("topic", topicName, "")
 	producers = producers.FilterByActive(s.ctx.nsqlookupd.opts.InactiveProducerTimeout,
 		s.ctx.nsqlookupd.opts.TombstoneLifetime)
+
 	return map[string]interface{}{
 		"channels":  channels,
 		"producers": producers.PeerInfo(),