Add Server function to connection

Author: dancannon

cluster.go

@@ -70,6 +70,16 @@ func (c *Cluster) Exec(q Query) (err error) {
 	return node.Exec(q)
 }
 
+// Server returns the server name and server UUID being used by a connection.
+func (c *Cluster) Server() (ServerResponse, error) {
+	node, err := c.GetRandomNode()
+	if err != nil {
+		return ServerResponse{}, err
+	}
+
+	return node.Server()
+}
+
 // SetMaxIdleConns sets the maximum number of connections in the idle
 // connection pool.
 func (c *Cluster) SetMaxIdleConns(n int) {

connection.go

@@ -115,7 +115,7 @@ func (c *Connection) Query(q Query) (*Response, *Cursor, error) {
 	}
 
 	// Add token if query is a START/NOREPLY_WAIT
-	if q.Type == p.Query_START || q.Type == p.Query_NOREPLY_WAIT {
+	if q.Type == p.Query_START || q.Type == p.Query_NOREPLY_WAIT || q.Type == p.Query_SERVER_INFO {
 		q.Token = c.nextToken()
 		if c.opts.Database != "" {
 			var err error
@@ -154,6 +154,33 @@ func (c *Connection) Query(q Query) (*Response, *Cursor, error) {
 	}
 }
 
+type ServerResponse struct {
+	ID   string `gorethink:"id"`
+	Name string `gorethink:"name"`
+}
+
+// Server returns the server name and server UUID being used by a connection.
+func (c *Connection) Server() (ServerResponse, error) {
+	var response ServerResponse
+
+	_, cur, err := c.Query(Query{
+		Type: p.Query_SERVER_INFO,
+	})
+	if err != nil {
+		return response, err
+	}
+
+	if err = cur.One(&response); err != nil {
+		return response, err
+	}
+
+	if err = cur.Close(); err != nil {
+		return response, err
+	}
+
+	return response, nil
+}
+
 // sendQuery marshals the Query and sends the JSON to the server.
 func (c *Connection) sendQuery(q Query) error {
 	// Build query
@@ -231,7 +258,7 @@ func (c *Connection) processResponse(q Query, response *Response) (*Response, *C
 		return c.processErrorResponse(q, response, RQLCompileError{rqlResponseError{response, q.Term}})
 	case p.Response_RUNTIME_ERROR:
 		return c.processErrorResponse(q, response, RQLRuntimeError{rqlResponseError{response, q.Term}})
-	case p.Response_SUCCESS_ATOM:
+	case p.Response_SUCCESS_ATOM, p.Response_SERVER_INFO:
 		return c.processAtomResponse(q, response)
 	case p.Response_SUCCESS_PARTIAL:
 		return c.processPartialResponse(q, response)

node.go

@@ -140,6 +140,23 @@ func (n *Node) Exec(q Query) (err error) {
 	return err
 }
 
+// Server returns the server name and server UUID being used by a connection.
+func (n *Node) Server() (ServerResponse, error) {
+	var response ServerResponse
+	var err error
+
+	if n.Closed() {
+		return response, ErrInvalidNode
+	}
+
+	response, err = n.pool.Server()
+	if err != nil {
+		n.DecrementHealth()
+	}
+
+	return response, err
+}
+
 // Refresh attempts to connect to the node and check that it is still connected
 // to the cluster.
 //

pool.go

@@ -531,6 +531,38 @@ func (p *Pool) queryConn(pc *poolConn, releaseConn func(error), q Query) (*Curso
 	return cursor, nil
 }
 
+// Server returns the server name and server UUID being used by a connection.
+func (p *Pool) Server() (ServerResponse, error) {
+	var response ServerResponse
+	var err error
+
+	for i := 0; i < maxBadConnRetries; i++ {
+		response, err = p.server()
+		if err != ErrBadConn {
+			break
+		}
+	}
+	return response, err
+}
+func (p *Pool) server() (ServerResponse, error) {
+	var response ServerResponse
+	var err error
+
+	pc, err := p.conn()
+	if err != nil {
+		return response, err
+	}
+	defer func() {
+		p.putConn(pc, err)
+	}()
+
+	pc.Lock()
+	response, err = pc.ci.Server()
+	pc.Unlock()
+
+	return response, err
+}
+
 // Helper functions
 
 func stack() string {

session.go

@@ -226,6 +226,11 @@ func (s *Session) Exec(q Query) error {
 	return s.cluster.Exec(q)
 }
 
+// Server returns the server name and server UUID being used by a connection.
+func (s *Session) Server() (ServerResponse, error) {
+	return s.cluster.Server()
+}
+
 // SetHosts resets the hosts used when connecting to the RethinkDB cluster
 func (s *Session) SetHosts(hosts []Host) {
 	s.mu.Lock()

session_test.go

@@ -75,6 +75,20 @@ func (s *RethinkSuite) TestSessionClose(c *test.C) {
 	c.Assert(err, test.NotNil)
 }
 
+func (s *RethinkSuite) TestSessionServer(c *test.C) {
+	session, err := Connect(ConnectOpts{
+		Address: url,
+		AuthKey: os.Getenv("RETHINKDB_AUTHKEY"),
+	})
+	c.Assert(err, test.IsNil)
+
+	server, err := session.Server()
+	c.Assert(err, test.IsNil)
+
+	c.Assert(len(server.ID) > 0, test.Equals, true)
+	c.Assert(len(server.Name) > 0, test.Equals, true)
+}
+
 func (s *RethinkSuite) TestSessionConnectDatabase(c *test.C) {
 	session, err := Connect(ConnectOpts{
 		Address:  url,