From 01b9355caae6e42d2ca396365bacab83ebde334f Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip.otoole@yahoo.com>
Date: Mon, 20 Nov 2023 21:18:19 -0500
Subject: [PATCH] Disco should return Raft address

---
 disco/service.go      | 6 +++---
 disco/service_test.go | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/disco/service.go b/disco/service.go
index 510b2a7b..99376477 100644
--- a/disco/service.go
+++ b/disco/service.go
@@ -59,12 +59,12 @@ func NewService(c Client, s Store) *Service {
 // it can use to join the cluster, or c) an unrecoverable error occurs.
 func (s *Service) Register(id, apiAddr, addr string) (bool, string, error) {
 	for {
-		_, cAPIAddr, _, ok, err := s.c.GetLeader()
+		_, _, cRaftAddr, ok, err := s.c.GetLeader()
 		if err != nil {
 			s.logger.Printf("failed to get leader: %s", err.Error())
 		}
 		if ok {
-			return false, cAPIAddr, nil
+			return false, cRaftAddr, nil
 		}
 
 		ok, err = s.c.InitializeLeader(id, apiAddr, addr)
@@ -73,7 +73,7 @@ func (s *Service) Register(id, apiAddr, addr string) (bool, string, error) {
 		}
 		if ok {
 			s.updateContact(time.Now())
-			return true, apiAddr, nil
+			return true, addr, nil
 		}
 
 		time.Sleep(random.Jitter(s.RegisterInterval))
diff --git a/disco/service_test.go b/disco/service_test.go
index cca58554..c5b3d916 100644
--- a/disco/service_test.go
+++ b/disco/service_test.go
@@ -34,7 +34,7 @@ func Test_RegisterGetLeaderOK(t *testing.T) {
 	if ok {
 		t.Fatalf("registered as leader unexpectedly")
 	}
-	if exp, got := "localhost:4003", addr; exp != got {
+	if exp, got := "localhost:4004", addr; exp != got {
 		t.Fatalf("returned addressed incorrect, exp %s, got %s", exp, got)
 	}
 }
@@ -62,7 +62,7 @@ func Test_RegisterInitializeLeader(t *testing.T) {
 	if !ok {
 		t.Fatalf("failed to register as expected")
 	}
-	if exp, got := "localhost:4001", addr; exp != got {
+	if exp, got := "localhost:4002", addr; exp != got {
 		t.Fatalf("returned addressed incorrect, exp %s, got %s", exp, got)
 	}
 }