Fixed inifinite retrylogic

common.go

@@ -24,6 +24,18 @@ type CommonOptions struct {
 	RetryDelay time.Duration // Delay between connection attempts
 }
 
+// TotalTries Returns the total number of times we shoyuld try to connect,
+// including the first try. For positive numbers this is retries + 1, for
+// negative we just leave it alone
+func (c CommonOptions) TotalTries() int {
+	if c.NumRetries >= 0 {
+		return c.NumRetries + 1
+	} else {
+		return c.NumRetries
+	}
+
+}
+
 // ConnectionOptions Options for connecting to each service, if these are nil,
 // the service won't be connected
 type ConnectionOptions struct {

dgraph.go

@@ -22,13 +22,13 @@ type DGraphConnectionOptions struct {
 
 func (d DGraphConnectionOptions) Connect() (*dgo.Dgraph, error) {
 	var dGraphClient *dgo.Dgraph
-	retriesLeft := d.NumRetries
+	tries := d.TotalTries()
 
 	if d.ConnectionTimeout == 0 {
 		d.ConnectionTimeout = ConnectionTimeoutDefault
 	}
 
-	for retriesLeft != 0 {
+	for tries != 0 {
 		connections := make([]*grpc.ClientConn, 0)
 
 		for _, server := range d.Servers {
@@ -71,7 +71,7 @@ func (d DGraphConnectionOptions) Connect() (*dgo.Dgraph, error) {
 				"servers": d.Servers,
 			}).Error("Could not connect to any DGraph endpoints")
 
-			retriesLeft--
+			tries--
 			time.Sleep(d.RetryDelay)
 			continue
 		}

dgraph_test.go

@@ -55,6 +55,44 @@ func TestDGraphConnect(t *testing.T) {
 
 		ValidateDGraphConnection(t, client)
 	})
+
+	t.Run("with a good URL and defaults", func(t *testing.T) {
+		o := DGraphConnectionOptions{
+			Servers: []string{
+				"dgraph:9080",
+				"localhost:9080",
+			},
+		}
+
+		client, err := o.Connect()
+
+		if err != nil {
+			t.Error(err)
+		}
+
+		ValidateDGraphConnection(t, client)
+	})
+
+	t.Run("with a good URL and infinite retrues", func(t *testing.T) {
+		o := DGraphConnectionOptions{
+			Servers: []string{
+				"dgraph:9080",
+				"localhost:9080",
+			},
+			CommonOptions: CommonOptions{
+				NumRetries: -1,
+				RetryDelay: 100 * time.Millisecond,
+			},
+		}
+
+		client, err := o.Connect()
+
+		if err != nil {
+			t.Error(err)
+		}
+
+		ValidateDGraphConnection(t, client)
+	})
 }
 
 func ValidateDGraphConnection(t *testing.T, c *dgo.Dgraph) {

nats.go

@@ -142,15 +142,15 @@ func (o NATSConnectionOptions) ToNatsOptions() (string, []nats.Option) {
 // unavailable
 func (o NATSConnectionOptions) Connect() (*nats.EncodedConn, error) {
 	servers, opts := o.ToNatsOptions()
-	retriesLeft := o.NumRetries + 1
+	tries := o.TotalTries()
 
 	var nc *nats.Conn
 	var enc *nats.EncodedConn
 	var err error
 
 	nats.RegisterEncoder("sdp", &sdp.ENCODER)
 
-	for retriesLeft != 0 {
+	for tries != 0 {
 		log.WithFields(log.Fields{
 			"servers": servers,
 		}).Info("NATS connecting")
@@ -165,7 +165,7 @@ func (o NATSConnectionOptions) Connect() (*nats.EncodedConn, error) {
 				"error": err.Error(),
 			}).Error("Error connecting to NATS")
 
-			retriesLeft--
+			tries--
 			time.Sleep(o.RetryDelay)
 			continue
 		}
@@ -177,7 +177,7 @@ func (o NATSConnectionOptions) Connect() (*nats.EncodedConn, error) {
 				"error": err.Error(),
 			}).Error("Error creating encoded connection")
 
-			retriesLeft--
+			tries--
 			time.Sleep(o.RetryDelay)
 			continue
 		}

nats_test.go

@@ -289,6 +289,27 @@ func TestNATSConnect(t *testing.T) {
 
 		ValidateNATSConnection(t, conn)
 	})
+
+	t.Run("with a good URL and infinite retries", func(t *testing.T) {
+		o := NATSConnectionOptions{
+			Servers: []string{
+				"nats://nats:4222",
+				"nats://localhost:4223",
+			},
+			CommonOptions: CommonOptions{
+				NumRetries: -1,
+				RetryDelay: 100 * time.Millisecond,
+			},
+		}
+
+		conn, err := o.Connect()
+
+		if err != nil {
+			t.Error(err)
+		}
+
+		ValidateNATSConnection(t, conn)
+	})
 }
 
 func ValidateNATSConnection(t *testing.T, enc *nats.EncodedConn) {