fix the consul setup code

registry/consul/consul.go

@@ -97,24 +97,33 @@ func configure(c *consulRegistry, opts ...registry.Option) {
 	}
 
 	// check if there are any addrs
-	if len(c.opts.Addrs) > 0 {
+	var addrs []string
-		addr, port, err := net.SplitHostPort(c.opts.Addrs[0])
+
+	// iterate the options addresses
+	for _, address := range c.opts.Addrs {
+		// check we have a port
+		addr, port, err := net.SplitHostPort(address)
 		if ae, ok := err.(*net.AddrError); ok && ae.Err == "missing port in address" {
 			port = "8500"
-			addr = c.opts.Addrs[0]
+			addr = address
-			config.Address = fmt.Sprintf("%s:%s", addr, port)
+			addrs = append(addrs, fmt.Sprintf("%s:%s", addr, port))
 		} else if err == nil {
-			config.Address = fmt.Sprintf("%s:%s", addr, port)
+			addrs = append(addrs, fmt.Sprintf("%s:%s", addr, port))
 		}
 	}
 
+	// set the addrs
+	if len(addrs) > 0 {
+		c.Address = addrs
+		config.Address = c.Address[0]
+	}
+
 	if config.HttpClient == nil {
 		config.HttpClient = new(http.Client)
 	}
 
 	// requires secure connection?
 	if c.opts.Secure || c.opts.TLSConfig != nil {
-
 		config.Scheme = "https"
 		// We're going to support InsecureSkipVerify
 		config.HttpClient.Transport = newTransport(c.opts.TLSConfig)
@@ -125,11 +134,13 @@ func configure(c *consulRegistry, opts ...registry.Option) {
 		config.HttpClient.Timeout = c.opts.Timeout
 	}
 
-	// set address
+	// set the config
-	c.Address = c.opts.Addrs
-
 	c.config = config
 
+	// remove client
+	c.client = nil
+
+	// setup the client
 	c.Client()
 }
 
@@ -384,20 +395,28 @@ func (c *consulRegistry) Client() *consul.Client {
 		return c.client
 	}
 
-	if len(c.Address) == 0 {
+	for _, addr := range c.Address {
-		tmp, _ := consul.NewClient(c.config)
+		// set the address
-		return tmp
+		c.config.Address = addr
+
+		// create a new client
+		tmpClient, _ := consul.NewClient(c.config)
+
+		// test the client
+		_, err := tmpClient.Agent().Host()
+		if err != nil {
+			continue
+		}
+
+		// set the client
+		c.client = tmpClient
+		return c.client
 	}
 
-	c.config.Address = c.Address[0]
+	// set the default
-	tmpClint, _ := consul.NewClient(c.config)
+	c.client, _ = consul.NewClient(c.config)
-	_, err := tmpClint.Agent().Host()
-	if err != nil {
-		c.Address = c.Address[1:]
-		return c.Client()
-	}
 
-	c.client = tmpClint
+	// return the client
 	return c.client
 }