From 1c6ef1d84f9a0884e6571fb622249cadc435ece3 Mon Sep 17 00:00:00 2001 From: Philip O'Toole Date: Sun, 1 May 2016 18:03:20 -0700 Subject: [PATCH] Use Raft advertise address, if exists, during join --- CHANGELOG.md | 3 +++ cmd/rqlited/main.go | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f49444b8..080e0807 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.0.1 (May 1st 2016) +- [PR #117](https://github.com/rqlite/rqlite/pull/117): Use Raft advertise address, if exists, during join. + ## 3.0.0 (May 1st 2016) - [PR #116](https://github.com/rqlite/rqlite/pull/116): Allow HTTP advertise address to be set. - [PR #115](https://github.com/rqlite/rqlite/pull/115): Support advertising address different than Raft bind address. diff --git a/cmd/rqlited/main.go b/cmd/rqlited/main.go index 67e3e2a3..c76c1f4b 100644 --- a/cmd/rqlited/main.go +++ b/cmd/rqlited/main.go @@ -194,7 +194,7 @@ func main() { if !store.JoinRequired() { log.Println("node is already member of cluster, ignoring join request") } else { - if err := join(joinAddr, noVerify, raftAddr); err != nil { + if err := join(joinAddr, noVerify, raftAddr, raftAdv); err != nil { log.Fatalf("failed to join node at %s: %s", joinAddr, err.Error()) } log.Println("successfully joined node at", joinAddr) @@ -252,8 +252,12 @@ func main() { log.Println("rqlite server stopped") } -func join(joinAddr string, skipVerify bool, raftAddr string) error { - b, err := json.Marshal(map[string]string{"addr": raftAddr}) +func join(joinAddr string, skipVerify bool, raftAddr, raftAdv string) error { + addr := raftAddr + if raftAdv != "" { + addr = raftAdv + } + b, err := json.Marshal(map[string]string{"addr": addr}) if err != nil { return err }