Merge pull request #276 from vieux/cleanup_discovery

Cleanup discovery
This commit is contained in:
Andrea Luzzardi 2015-01-22 11:53:29 -08:00
commit 3106f042c0
7 changed files with 28 additions and 3 deletions

View File

@ -1,7 +1,7 @@
package consul
import (
"errors"
"fmt"
"path"
"strings"
"time"
@ -25,7 +25,7 @@ func init() {
func (s *ConsulDiscoveryService) Initialize(uris string, heartbeat int) error {
parts := strings.SplitN(uris, "/", 2)
if len(parts) < 2 {
return errors.New("missing consul prefix")
return fmt.Errorf("invalid format %q, missing <path>", uris)
}
addr := parts[0]
path := parts[1]

View File

@ -8,6 +8,13 @@ import (
func TestInitialize(t *testing.T) {
discovery := &ConsulDiscoveryService{}
discovery.Initialize("127.0.0.1:8500/path", 0)
assert.Equal(t, discovery.Initialize("127.0.0.1", 0).Error(), "invalid format \"127.0.0.1\", missing <path>")
assert.Error(t, discovery.Initialize("127.0.0.1/path", 0))
assert.Equal(t, discovery.prefix, "path/")
assert.Error(t, discovery.Initialize("127.0.0.1,127.0.0.2,127.0.0.3/path", 0))
assert.Equal(t, discovery.prefix, "path/")
}

View File

@ -1,6 +1,7 @@
package etcd
import (
"fmt"
"path"
"strings"
@ -27,6 +28,11 @@ func (s *EtcdDiscoveryService) Initialize(uris string, heartbeat int) error {
ips = strings.Split(parts[0], ",")
machines []string
)
if len(parts) != 2 {
return fmt.Errorf("invalid format %q, missing <path>", uris)
}
for _, ip := range ips {
machines = append(machines, "http://"+ip)
}

View File

@ -8,6 +8,9 @@ import (
func TestInitialize(t *testing.T) {
discovery := &EtcdDiscoveryService{}
assert.Equal(t, discovery.Initialize("127.0.0.1", 0).Error(), "invalid format \"127.0.0.1\", missing <path>")
assert.Error(t, discovery.Initialize("127.0.0.1/path", 0))
assert.Equal(t, discovery.path, "/path/")

View File

@ -1,6 +1,7 @@
package zookeeper
import (
"fmt"
"path"
"strings"
"time"
@ -28,6 +29,10 @@ func (s *ZkDiscoveryService) Initialize(uris string, heartbeat int) error {
ips = strings.Split(parts[0], ",")
)
if len(parts) != 2 {
return fmt.Errorf("invalid format %q, missing <path>", uris)
}
conn, _, err := zk.Connect(ips, time.Second)
if err != nil {

View File

@ -9,6 +9,9 @@ import (
func TestInitialize(t *testing.T) {
service := &ZkDiscoveryService{}
assert.Equal(t, service.Initialize("127.0.0.1", 0).Error(), "invalid format \"127.0.0.1\", missing <path>")
assert.Error(t, service.Initialize("127.0.0.1/path", 0))
assert.Equal(t, service.path, "/path")

View File

@ -13,6 +13,7 @@ DESCRIPTION:
ARGUMENTS:
discovery{{printf "\t"}}discovery service to use [$SWARM_DISCOVERY]
{{printf "\t"}} * token://<token>
{{printf "\t"}} * consul://<ip1>,<ip2>/<path>
{{printf "\t"}} * etcd://<ip1>,<ip2>/<path>
{{printf "\t"}} * file://path/to/file
{{printf "\t"}} * zk://<ip1>,<ip2>/<path>