Merge pull request #623 from erikh/fix-etcd-svcplugin

netplugin/svcplugin: check etcd connection errors.

Author: Erik Hollensbe

netplugin/svcplugin/bridge/bridge.go

@@ -42,9 +42,14 @@ func New(adapterURI string, config Config) (*Bridge, error) {
 	}
 
 	log.Infof("Using", uri.Scheme, "service adapter:", uri)
+	reg, err := factory.New(uri)
+	if err != nil {
+		return nil, err
+	}
+
 	return &Bridge{
 		config:   config,
-		registry: factory.New(uri),
+		registry: reg,
 		services: make(map[string][]*Service),
 	}, nil
 }

netplugin/svcplugin/bridge/types.go

@@ -8,7 +8,7 @@ import (
 
 // AdapterFactory implements the ServiceRegistrator
 type AdapterFactory interface {
-	New(uri *url.URL) RegistryAdapter
+	New(uri *url.URL) (RegistryAdapter, error)
 }
 
 // RegistryAdapter defines the interface that ServiceRegistrators must implement

netplugin/svcplugin/skydns2extension/skydns2.go

@@ -21,7 +21,7 @@ func init() {
 type Factory struct{}
 
 // New function to register Skydns2Adapter
-func (f *Factory) New(uri *url.URL) bridge.RegistryAdapter {
+func (f *Factory) New(uri *url.URL) (bridge.RegistryAdapter, error) {
 	if uri.Host == "" {
 		uri.Host = "localhost:2379"
 	}
@@ -33,9 +33,10 @@ func (f *Factory) New(uri *url.URL) bridge.RegistryAdapter {
 	etcdClient, err := client.New(etcdConfig)
 	if err != nil {
 		log.Fatalf("Error creating etcd client. Err: %v", err)
+		return nil, err
 	}
 
-	return &Skydns2Adapter{client: client.NewKeysAPI(etcdClient)}
+	return &Skydns2Adapter{client: client.NewKeysAPI(etcdClient)}, nil
 }
 
 // Skydns2Adapter implements skydns2 client interface