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: pass httpActionDo into New[Discovery]KeysAPI

Browse Source
This commit is contained in:
Brian Waldon 2014-10-31 10:59:39 -07:00
parent 1130273178
commit 0ef270c25c
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
client/keys.go
View File

@ -41,27 +41,20 @@ var (
ErrKeyExists = errors.New("client: key already exists")
)
func NewKeysAPI(tr *http.Transport, eps []string, to time.Duration) (KeysAPI, error) {
return newHTTPKeysAPIWithPrefix(tr, eps, to, DefaultV2KeysPrefix)
}
func NewDiscoveryKeysAPI(tr *http.Transport, eps []string, to time.Duration) (KeysAPI, error) {
return newHTTPKeysAPIWithPrefix(tr, eps, to, "")
}
func newHTTPKeysAPIWithPrefix(tr *http.Transport, eps []string, to time.Duration, prefix string) (*httpKeysAPI, error) {
c, err := NewHTTPClient(tr, eps)
if err != nil {
return nil, err
}
kAPI := httpKeysAPI{
func NewKeysAPI(c httpActionDo, to time.Duration) KeysAPI {
return &httpKeysAPI{
client: c,
prefix: prefix,
prefix: DefaultV2KeysPrefix,
timeout: to,
}
}
return &kAPI, nil
func NewDiscoveryKeysAPI(c httpActionDo, to time.Duration) KeysAPI {
return &httpKeysAPI{
client: c,
prefix: "",
timeout: to,
}
}
type KeysAPI interface {

5
discovery/discovery.go
View File

@ -106,15 +106,16 @@ func New(durl string, id types.ID, config string) (Discoverer, error) {
if err != nil {
return nil, err
}
c, err := client.NewDiscoveryKeysAPI(&http.Transport{Proxy: pf}, []string{u.String()}, client.DefaultRequestTimeout)
c, err := client.NewHTTPClient(&http.Transport{Proxy: pf}, []string{u.String()})
if err != nil {
return nil, err
}
dc := client.NewDiscoveryKeysAPI(c, client.DefaultRequestTimeout)
return &discovery{
cluster: token,
id: id,
config: config,
c: c,
c: dc,
url: u,
clock: clockwork.NewRealClock(),
}, nil