Fix bug in etcd backend when connecting to etcd2

Marmelatze · May 12, 2015 · ac0394e · ac0394e
1 parent 66add71
commit ac0394e
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/etcd/etcd.go b/etcd/etcd.go
@@ -52,8 +52,15 @@ type EtcdAdapter struct {
 }
 
 func (r *EtcdAdapter) Ping() error {
-	rr := etcd.NewRawRequest("GET", "version", nil, nil)
-	_, err := r.client.SendRequest(rr)
+	var err error
+	if r.client != nil {
+		rr := etcd.NewRawRequest("GET", "version", nil, nil)
+		_, err = r.client.SendRequest(rr)
+	} else {
+		rr := etcd2.NewRawRequest("GET", "version", nil, nil)
+		_, err = r.client2.SendRequest(rr)
+	}
+
 	if err != nil {
 		return err
 	}