Merge pull request apache#236 from juliendsv/master

s/DefaultPort/Port/
tux21b · Aug 20, 2014 · 7bd964e · 7bd964e
2 parents 4b86114 + 14c1e97
commit 7bd964e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -29,3 +29,4 @@ Fred McCann <[email protected]>
 Dan Simmons <[email protected]>
 Muir Manders <[email protected]>
 Sankar P <[email protected]>
+Julien Da Silva <[email protected]>
diff --git a/cluster.go b/cluster.go
@@ -49,7 +49,7 @@ type ClusterConfig struct {
 	CQLVersion       string        // CQL version (default: 3.0.0)
 	ProtoVersion     int           // version of the native protocol (default: 2)
 	Timeout          time.Duration // connection timeout (default: 600ms)
-	DefaultPort      int           // default port (default: 9042)
+	Port             int           // port (default: 9042)
 	Keyspace         string        // initial keyspace (optional)
 	NumConns         int           // number of connections per host (default: 2)
 	NumStreams       int           // number of streams per connection (default: 128)
@@ -71,7 +71,7 @@ func NewCluster(hosts ...string) *ClusterConfig {
 		CQLVersion:       "3.0.0",
 		ProtoVersion:     2,
 		Timeout:          600 * time.Millisecond,
-		DefaultPort:      9042,
+		Port:             9042,
 		NumConns:         2,
 		NumStreams:       128,
 		Consistency:      Quorum,

diff --git a/connectionpool.go b/connectionpool.go
@@ -30,7 +30,7 @@ Example of Single Connection Pool:
 	func NewSingleConnection(cfg *ClusterConfig) ConnectionPool {
 		addr := strings.TrimSpace(cfg.Hosts[0])
 		if strings.Index(addr, ":") < 0 {
-			addr = fmt.Sprintf("%s:%d", addr, cfg.DefaultPort)
+			addr = fmt.Sprintf("%s:%d", addr, cfg.Port)
 		}
 		connCfg := ConnConfig{
 			ProtoVersion:  cfg.ProtoVersion,
@@ -146,7 +146,7 @@ func NewSimplePool(cfg *ClusterConfig) ConnectionPool {
 	for i := 0; i < len(cfg.Hosts); i++ {
 		addr := strings.TrimSpace(cfg.Hosts[i])
 		if strings.Index(addr, ":") < 0 {
-			addr = fmt.Sprintf("%s:%d", addr, cfg.DefaultPort)
+			addr = fmt.Sprintf("%s:%d", addr, cfg.Port)
 		}
 
 		if pool.connect(addr) == nil {
@@ -236,7 +236,7 @@ func (c *SimplePool) fillPool() {
 	for host := range c.hosts {
 		addr := strings.TrimSpace(host)
 		if strings.Index(addr, ":") < 0 {
-			addr = fmt.Sprintf("%s:%d", addr, c.cfg.DefaultPort)
+			addr = fmt.Sprintf("%s:%d", addr, c.cfg.Port)
 		}
 
 		numConns := 1