Merge tag 'v1.0.0-rc.2' into develop

Released v1.0.0-rc.2

Author: dancannon

.travis.yml

@@ -6,14 +6,13 @@ go:
   - 1.4
   - tip
 
-before_install:
-  - wget http://download.rethinkdb.com/dev/2.0.0-0RC1/rethinkdb_2.0.0%2b0RC1~0precise_amd64.deb
-  - sudo dpkg -i rethinkdb_2.0.0+0RC1~0precise_amd64.deb
+cache: apt
 
 before_script:
-#   - sudo add-apt-repository ppa:rethinkdb/ppa -y
-#   - sudo apt-get update -q
-#   - sudo apt-get install rethinkdb
+  - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
+  - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
+  - sudo apt-get update
+  - sudo apt-get install rethinkdb
   - rethinkdb > /dev/null 2>&1 &
   - rethinkdb --port-offset 1 --directory rethinkdb_data1 --join localhost:29016 > /dev/null 2>&1 &
   - rethinkdb --port-offset 2 --directory rethinkdb_data2 --join localhost:29016 > /dev/null 2>&1 &

CHANGELOG.md

@@ -2,7 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## v1.0.0-RC.1 - 2015-06-07
+## v1.0.0 RC2 - 2015-06-11
+
+### Fixed
+ - Fixed issue causing driver to fail when connecting to DB which did not have its canonical address set correctly (#200).
+
+## v1.0.0 RC1 - 2015-06-07
 In an attempt to make this library more "idiomatic" some functions have been renamed, for the full list of changes see below.
 
 ### Added

README.md

@@ -7,7 +7,7 @@
 [Go](http://golang.org/) driver for [RethinkDB](http://www.rethinkdb.com/) 
 
 
-Current version: v1.0.0-RC.1 (RethinkDB v2.0) 
+Current version: v1.0.0 RC2 (RethinkDB v2.0) 
 
 Please note that this version of the driver only supports versions of RethinkDB using the v0.4 protocol (any versions of the driver older than RethinkDB 2.0 will not work).
 

cluster.go

@@ -206,14 +206,27 @@ func (c *Cluster) connectNodes(hosts []Host) {
 			continue
 		}
 
-		var results []nodeStatus
-		err = cursor.All(&results)
-		if err != nil {
-			continue
-		}
+		if c.opts.DiscoverHosts {
+			var results []nodeStatus
+			err = cursor.All(&results)
+			if err != nil {
+				continue
+			}
 
-		for _, result := range results {
-			node, err := c.connectNodeWithStatus(result)
+			for _, result := range results {
+				node, err := c.connectNodeWithStatus(result)
+				if err == nil {
+					if _, ok := nodeSet[node.ID]; !ok {
+						log.WithFields(logrus.Fields{
+							"id":   node.ID,
+							"host": node.Host.String(),
+						}).Debug("Connected to node")
+						nodeSet[node.ID] = node
+					}
+				}
+			}
+		} else {
+			node, err := c.connectNode(host.String(), []Host{host})
 			if err == nil {
 				if _, ok := nodeSet[node.ID]; !ok {
 					log.WithFields(logrus.Fields{

doc.go

@@ -1,6 +1,6 @@
 // Package gorethink implements a Go driver for RethinkDB
 //
-// Current version: v1.0.0-rc.1 (RethinkDB v2.0)
+// Current version: v1.0.0-rc.2 (RethinkDB v2.0)
 // For more in depth information on how to use RethinkDB check out the API docs
 // at http://rethinkdb.com/api
 package gorethink

node.go

@@ -45,7 +45,6 @@ func newNode(id string, aliases []Host, cluster *Cluster, pool *Pool) *Node {
 	}
 
 	go func() {
-
 		refreshTicker := time.NewTicker(refreshInterval)
 		for {
 			select {
@@ -124,7 +123,7 @@ func (n *Node) Query(q Query) (cursor *Cursor, err error) {
 		n.DecrementHealth()
 	}
 
-	return
+	return cursor, err
 }
 
 // Exec executes a ReQL query using this nodes connection pool.
@@ -138,7 +137,7 @@ func (n *Node) Exec(q Query) (err error) {
 		n.DecrementHealth()
 	}
 
-	return
+	return err
 }
 
 // Refresh attempts to connect to the node and check that it is still connected
@@ -148,26 +147,52 @@ func (n *Node) Exec(q Query) (err error) {
 // the nodes health is decrease, if there were no issues then the node is marked
 // as being healthy.
 func (n *Node) Refresh() {
-	cursor, err := n.pool.Query(newQuery(
-		DB("rethinkdb").Table("server_status").Get(n.ID),
-		map[string]interface{}{},
-		n.cluster.opts,
-	))
-	if err != nil {
-		n.DecrementHealth()
-		return
-	}
-	defer cursor.Close()
+	if n.cluster.opts.DiscoverHosts {
+		// If host discovery is enabled then check the servers status
+		cursor, err := n.pool.Query(newQuery(
+			DB("rethinkdb").Table("server_status").Get(n.ID),
+			map[string]interface{}{},
+			n.cluster.opts,
+		))
+		if err != nil {
+			n.DecrementHealth()
+			return
+		}
+		defer cursor.Close()
 
-	var status nodeStatus
-	err = cursor.One(&status)
-	if err != nil {
-		return
-	}
+		var status nodeStatus
+		err = cursor.One(&status)
+		if err != nil {
+			return
+		}
 
-	if status.Status != "connected" {
-		n.DecrementHealth()
-		return
+		if status.Status != "connected" {
+			n.DecrementHealth()
+			return
+		}
+	} else {
+		// If host discovery is disabled just execute a simple ping query
+		cursor, err := n.pool.Query(newQuery(
+			Expr("OK"),
+			map[string]interface{}{},
+			n.cluster.opts,
+		))
+		if err != nil {
+			n.DecrementHealth()
+			return
+		}
+		defer cursor.Close()
+
+		var status string
+		err = cursor.One(&status)
+		if err != nil {
+			return
+		}
+
+		if status != "OK" {
+			n.DecrementHealth()
+			return
+		}
 	}
 
 	// If status check was successful reset health

wercker.yml

@@ -1,18 +1,22 @@
-box: wercker/golang
+box: google/golang
 # Services
 services:
-    - dancannon/rethinkdb@0.4.0
+    - rethinkdb
 # Build definition
 build:
     # The steps that will be executed on build
     steps:
-        - pjvds/setup-go-workspace
+        - setup-go-workspace
+        
+        - script:
+            name: set rethinkdb_url
+            code: |
+              export RETHINKDB_URL=$RETHINKDB_PORT_28015_TCP_ADDR
+
         # Gets the dependencies
         - script:
             name: get dependencies
             code: |
-                cd $WERCKER_SOURCE_DIR
-                go version
                 go get ./...
         # Build the project
         - script: