Browse Source

client: collapse unnecessary constructor

Brian Waldon 11 years ago
parent
commit
f037cb9f65
1 changed files with 5 additions and 9 deletions
  1. 5 9
      client/http.go

+ 5 - 9
client/http.go

@@ -52,7 +52,11 @@ type ClientConfig struct {
 }
 }
 
 
 func New(cfg ClientConfig) (SyncableHTTPClient, error) {
 func New(cfg ClientConfig) (SyncableHTTPClient, error) {
-	return newHTTPClusterClient(cfg.Transport, cfg.Endpoints, defaultHTTPClientFactory)
+	c := &httpClusterClient{clientFactory: defaultHTTPClientFactory}
+	if err := c.reset(cfg.Transport, cfg.Endpoints); err != nil {
+		return nil, err
+	}
+	return c, nil
 }
 }
 
 
 type SyncableHTTPClient interface {
 type SyncableHTTPClient interface {
@@ -79,14 +83,6 @@ type CancelableTransport interface {
 	CancelRequest(req *http.Request)
 	CancelRequest(req *http.Request)
 }
 }
 
 
-func newHTTPClusterClient(tr CancelableTransport, eps []string, cf httpClientFactory) (*httpClusterClient, error) {
-	c := &httpClusterClient{clientFactory: cf}
-	if err := c.reset(tr, eps); err != nil {
-		return nil, err
-	}
-	return c, nil
-}
-
 type httpClusterClient struct {
 type httpClusterClient struct {
 	clientFactory httpClientFactory
 	clientFactory httpClientFactory
 	transport     CancelableTransport
 	transport     CancelableTransport