Extracts only the relevant pieces of the version string

pkg/adaptor/rethinkdb.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
+	"regexp"
 	"strings"
 	"time"
 
@@ -56,6 +57,10 @@ type rethinkDbServerStatus struct {
 	Process rethinkDbProcessStatus `gorethink:"process"`
 }
 
+var (
+	rethinkDbVersionMatcher *regexp.Regexp = regexp.MustCompile(`\d+\.\d+(\.\d+)?`)
+)
+
 // NewRethinkdb creates a new Rethinkdb database adaptor
 func NewRethinkdb(p *pipe.Pipe, path string, extra Config) (StopStartListener, error) {
 	var (
@@ -130,7 +135,16 @@ func (r *Rethinkdb) assertServerVersion(constraint version.Constraints) error {
 		return fmt.Errorf("could not determine the RethinkDB server version: malformed version string (%v)", serverStatus.Process.Version)
 	}
 
-	serverVersion, err := version.NewVersion(pieces[1])
+	versionString := rethinkDbVersionMatcher.FindString(pieces[1])
+	if versionString == "" {
+		return fmt.Errorf("could not determine the RethinkDB server version: malformed version string (%v)", serverStatus.Process.Version)
+	}
+
+	if r.debug {
+		fmt.Printf("RethinkDB version: %v\n", versionString)
+	}
+
+	serverVersion, err := version.NewVersion(versionString)
 	if err != nil {
 		return fmt.Errorf("could not determine the RethinkDB server version: malformed version string (%v)", serverStatus.Process.Version)
 	}