Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: accept slice of endpoints

Browse Source
This commit is contained in:
Brian Waldon 2014-10-30 17:22:47 -07:00
parent 8d519ffdb8
commit 8b8b3efdaa
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/cluster.go
View File

@ -33,6 +33,7 @@ func newHTTPClusterClient(tr *http.Transport, eps []string) (*httpClusterClient,
if err != nil { if err != nil {
return nil, err return nil, err
} }
c.endpoints[i] = &httpClient{ c.endpoints[i] = &httpClient{
transport: tr, transport: tr,
endpoint: *u, endpoint: *u,

12
client/keys.go
View File

@ -41,16 +41,16 @@ var (
ErrKeyExists = errors.New("client: key already exists") ErrKeyExists = errors.New("client: key already exists")
) )
func NewKeysAPI(tr *http.Transport, ep string, to time.Duration) (KeysAPI, error) { func NewKeysAPI(tr *http.Transport, eps []string, to time.Duration) (KeysAPI, error) {
return newHTTPKeysAPIWithPrefix(tr, ep, to, DefaultV2KeysPrefix) return newHTTPKeysAPIWithPrefix(tr, eps, to, DefaultV2KeysPrefix)
} }
func NewDiscoveryKeysAPI(tr *http.Transport, ep string, to time.Duration) (KeysAPI, error) { func NewDiscoveryKeysAPI(tr *http.Transport, eps []string, to time.Duration) (KeysAPI, error) {
return newHTTPKeysAPIWithPrefix(tr, ep, to, "") return newHTTPKeysAPIWithPrefix(tr, eps, to, "")
} }
func newHTTPKeysAPIWithPrefix(tr *http.Transport, ep string, to time.Duration, prefix string) (*httpKeysAPI, error) { func newHTTPKeysAPIWithPrefix(tr *http.Transport, eps []string, to time.Duration, prefix string) (*httpKeysAPI, error) {
c, err := newHTTPClusterClient(tr, []string{ep}) c, err := newHTTPClusterClient(tr, eps)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
client/members.go
View File

@ -34,8 +34,8 @@ var (
DefaultV2MembersPrefix = "/v2/members" DefaultV2MembersPrefix = "/v2/members"
) )
func NewMembersAPI(tr *http.Transport, ep string, to time.Duration) (MembersAPI, error) { func NewMembersAPI(tr *http.Transport, eps []string, to time.Duration) (MembersAPI, error) {
c, err := newHTTPClusterClient(tr, []string{ep}) c, err := newHTTPClusterClient(tr, eps)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
discovery/discovery.go
View File

@ -106,7 +106,7 @@ func New(durl string, id types.ID, config string) (Discoverer, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
c, err := client.NewDiscoveryKeysAPI(&http.Transport{Proxy: pf}, u.String(), client.DefaultRequestTimeout) c, err := client.NewDiscoveryKeysAPI(&http.Transport{Proxy: pf}, []string{u.String()}, client.DefaultRequestTimeout)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
etcdctl/command/member_commands.go
View File

@ -34,7 +34,7 @@ func NewMemberCommand() cli.Command {
} }
func mustNewMembersAPI(c *cli.Context) client.MembersAPI { func mustNewMembersAPI(c *cli.Context) client.MembersAPI {
mAPI, err := client.NewMembersAPI(&http.Transport{}, "http://127.0.0.1:4001", client.DefaultRequestTimeout) mAPI, err := client.NewMembersAPI(&http.Transport{}, []string{"http://127.0.0.1:4001"}, client.DefaultRequestTimeout)
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err.Error()) fmt.Fprintln(os.Stderr, err.Error())
os.Exit(1) os.Exit(1)