Use locally-enabled cluster client in HTTP service

cmd/rqlited/main.go

@@ -307,6 +307,7 @@ func main() {
 	// Start the HTTP API server.
 	clstrDialer := tcp.NewDialer(cluster.MuxClusterHeader, nodeEncrypt, noNodeVerify)
 	clstrClient := cluster.NewClient(clstrDialer)
+	clstrClient.SetLocal(raftAdv, clstr)
 	if err := startHTTPService(str, clstrClient); err != nil {
 		log.Fatalf("failed to start HTTP server: %s", err.Error())
 	}

http/service.go

@@ -1002,23 +1002,11 @@ func (s *Service) checkNodesAPIAddr(nodes []*store.Server, timeout time.Duration
 		wg.Add(1)
 		go func(id, raftAddr string) {
 			defer wg.Done()
-
-			localRaftAddr, err := s.store.LeaderAddr()
-			if err != nil {
-				return
-			}
-
-			if raftAddr == localRaftAddr {
+			apiAddr, err := s.cluster.GetNodeAPIAddr(raftAddr)
+			if err == nil {
 				mu.Lock()
-				apiAddrs[id] = localRaftAddr
+				apiAddrs[id] = apiAddr
 				mu.Unlock()
-			} else {
-				apiAddr, err := s.cluster.GetNodeAPIAddr(raftAddr)
-				if err == nil {
-					mu.Lock()
-					apiAddrs[id] = apiAddr
-					mu.Unlock()
-				}
 			}
 		}(n.ID, n.Addr)
 	}