luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

consul: Adding Addr to serverParts

This commit is contained in:
Armon Dadgar 2014-05-27 14:45:36 -07:00
parent a79c3d2103
commit c8831db91c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
consul/util.go
View File

@ -25,6 +25,7 @@ type serverParts struct {
Datacenter string Datacenter string
Port int Port int
Bootstrap bool Bootstrap bool
Addr net.Addr
} }
func init() { func init() {
@ -81,8 +82,8 @@ func isConsulServer(m serf.Member) (bool, *serverParts) {
if err != nil { if err != nil {
return false, nil return false, nil
} }
addr := &net.TCPAddr{IP: m.Addr, Port: port}
return true, &serverParts{datacenter, port, bootstrap} return true, &serverParts{datacenter, port, bootstrap, addr}
} }
// Returns if a member is a consul node. Returns a boo, // Returns if a member is a consul node. Returns a boo,

5
consul/util_test.go
View File

@ -2,6 +2,7 @@ package consul
import ( import (
"github.com/hashicorp/serf/serf" "github.com/hashicorp/serf/serf"
"net"
"regexp" "regexp"
"testing" "testing"
) )
@ -36,6 +37,7 @@ func TestIsPrivateIP(t *testing.T) {
func TestIsConsulServer(t *testing.T) { func TestIsConsulServer(t *testing.T) {
m := serf.Member{ m := serf.Member{
Addr: net.IP([]byte{127, 0, 0, 1}),
Tags: map[string]string{ Tags: map[string]string{
"role": "consul", "role": "consul",
"dc": "east-aws", "dc": "east-aws",
@ -54,6 +56,9 @@ func TestIsConsulServer(t *testing.T) {
if !valid || !parts.Bootstrap { if !valid || !parts.Bootstrap {
t.Fatalf("expected bootstrap") t.Fatalf("expected bootstrap")
} }
if parts.Addr.String() != "127.0.0.1:10000" {
t.Fatalf("bad addr: %v", parts.Addr)
}
} }
func TestIsConsulNode(t *testing.T) { func TestIsConsulNode(t *testing.T) {