mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

client: ClientConfig -> Config

Browse Source
This commit is contained in:
Brian Waldon
2015-01-26 17:26:15 -08:00
committed by Yicheng Qin
parent 2aecbaf165
commit 3b41b77cd7
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/http.go
View File

@ -46,12 +46,12 @@ func defaultHTTPClientFactory(tr CancelableTransport, ep url.URL) HTTPClient {
} }
} }
type ClientConfig struct { type Config struct {
Endpoints []string Endpoints []string
Transport CancelableTransport Transport CancelableTransport
} }
func New(cfg ClientConfig) (SyncableHTTPClient, error) { func New(cfg Config) (SyncableHTTPClient, error) {
c := &httpClusterClient{clientFactory: defaultHTTPClientFactory} c := &httpClusterClient{clientFactory: defaultHTTPClientFactory}
if err := c.reset(cfg.Transport, cfg.Endpoints); err != nil { if err := c.reset(cfg.Transport, cfg.Endpoints); err != nil {
return nil, err return nil, err

2
discovery/discovery.go
View File

@ -117,7 +117,7 @@ func newDiscovery(durl, dproxyurl string, id types.ID) (*discovery, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
cfg := client.ClientConfig{ cfg := client.Config{
Transport: &http.Transport{Proxy: pf}, Transport: &http.Transport{Proxy: pf},
Endpoints: []string{u.String()}, Endpoints: []string{u.String()},
} }

2
etcdctl/command/member_commands.go
View File

@ -61,7 +61,7 @@ func mustNewMembersAPI(c *cli.Context) client.MembersAPI {
os.Exit(1) os.Exit(1)
} }
cfg := client.ClientConfig{ cfg := client.Config{
Transport: tr, Transport: tr,
Endpoints: eps, Endpoints: eps,
} }

4
integration/cluster_test.go
View File

@ -615,8 +615,8 @@ func (m *member) Terminate(t *testing.T) {
} }
func mustNewHTTPClient(t *testing.T, eps []string) client.SyncableHTTPClient { func mustNewHTTPClient(t *testing.T, eps []string) client.SyncableHTTPClient {
cc := client.ClientConfig{Transport: mustNewTransport(t), Endpoints: eps} cfg := client.Config{Transport: mustNewTransport(t), Endpoints: eps}
c, err := client.New(cc) c, err := client.New(cfg)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }