Merge pull request #231 from chanwit/cleanup-zookeeper

Cleanup: zookeeper discovery's watcher

discovery/zookeeper/zookeeper.go

@@ -56,21 +56,30 @@ func (s *ZkDiscoveryService) Fetch() ([]*discovery.Node, error) {
 		return nil, err
 	}
 
-	var nodes []*discovery.Node
+	return s.createNodes(addrs), nil
+}
+
+func (s *ZkDiscoveryService) createNodes(addrs []string) (nodes []*discovery.Node) {
+	nodes = make([]*discovery.Node, 0)
+	if addrs == nil {
+		return
+	}
+
 	for _, addr := range addrs {
 		nodes = append(nodes, discovery.NewNode(addr))
 	}
-
+	return
-	return nodes, nil
 }
 
 func (s *ZkDiscoveryService) Watch(callback discovery.WatchCallback) {
 
-	_, _, eventChan, err := s.conn.ChildrenW(s.path)
+	addrs, _, eventChan, err := s.conn.ChildrenW(s.path)
 	if err != nil {
 		log.Debugf("[ZK] Watch aborted")
 		return
 	}
+	nodes := s.createNodes(addrs)
+	callback(nodes)
 
 	for e := range eventChan {
 		if e.Type == zk.EventNodeChildrenChanged {

discovery/zookeeper/zookeeper_test.go

@@ -3,14 +3,23 @@ package zookeeper
 import (
 	"testing"
 
+	"github.com/docker/swarm/discovery"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestInitialize(t *testing.T) {
-	discovery := &ZkDiscoveryService{}
+	service := &ZkDiscoveryService{}
-	assert.Error(t, discovery.Initialize("127.0.0.1/path", 0))
+	assert.Error(t, service.Initialize("127.0.0.1/path", 0))
-	assert.Equal(t, discovery.path, "/path")
+	assert.Equal(t, service.path, "/path")
 
-	assert.Error(t, discovery.Initialize("127.0.0.1,127.0.0.2,127.0.0.3/path", 0))
+	assert.Error(t, service.Initialize("127.0.0.1,127.0.0.2,127.0.0.3/path", 0))
-	assert.Equal(t, discovery.path, "/path")
+	assert.Equal(t, service.path, "/path")
+}
+
+func TestCreateNodes(t *testing.T) {
+	service := &ZkDiscoveryService{}
+	assert.Equal(t, service.createNodes(nil), []*discovery.Node{})
+	nodes := service.createNodes([]string{"127.0.0.1", "127.0.0.2"})
+	assert.Equal(t, nodes[0].String(), "http://127.0.0.1")
+	assert.Equal(t, nodes[1].String(), "http://127.0.0.2")
 }