Skip to content

Commit

Permalink
clear ipv6 address in lookupd lookup api
Browse files Browse the repository at this point in the history
  • Loading branch information
andyxning committed Aug 25, 2019
1 parent 1db3903 commit c4285ff
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions nsqlookupd/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"net/http"
"net/http/pprof"
"strings"
"sync/atomic"

"github.com/julienschmidt/httprouter"
Expand Down Expand Up @@ -121,6 +122,14 @@ 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)

for _, producer := range producers {
// Assume it is an ipv6 address if a colon is in it
if strings.Contains(producer.peerInfo.BroadcastAddress, ":") {
producer.peerInfo.BroadcastAddress = strings.TrimPrefix(producer.peerInfo.BroadcastAddress, "[")
producer.peerInfo.BroadcastAddress = strings.TrimSuffix(producer.peerInfo.BroadcastAddress, "]")
}
}
return map[string]interface{}{
"channels": channels,
"producers": producers.PeerInfo(),
Expand Down

0 comments on commit c4285ff

Please sign in to comment.