feat: use retrable (#46)

Author: bietkul

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/gobuffalo/packr v1.22.0
 	github.com/google/uuid v1.0.0
 	github.com/gorilla/mux v1.7.1
+	github.com/hashicorp/go-retryablehttp v0.6.3
 	github.com/olivere/elastic v6.2.21+incompatible
 	github.com/olivere/elastic/v7 v7.0.4
 	github.com/robfig/cron v1.1.0

go.sum

@@ -235,6 +235,12 @@ github.com/gorilla/pat v0.0.0-20180118222023-199c85a7f6d1/go.mod h1:YeAe0gNeiNT5
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.1.2/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
+github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
+github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI=
+github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-retryablehttp v0.6.3 h1:tuulM+WnToeqa05z83YLmKabZxrySOmJAd4mJ+s2Nfg=
+github.com/hashicorp/go-retryablehttp v0.6.3/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=

plugins/elasticsearch/handlers.go

@@ -4,12 +4,12 @@ import (
 	"io"
 	"log"
 	"net/http"
-	"time"
 
 	"github.com/appbaseio/arc/model/acl"
 	"github.com/appbaseio/arc/model/category"
 	"github.com/appbaseio/arc/model/op"
 	"github.com/appbaseio/arc/util"
+	"github.com/hashicorp/go-retryablehttp"
 )
 
 func (es *elasticsearch) handler() http.HandlerFunc {
@@ -37,21 +37,22 @@ func (es *elasticsearch) handler() http.HandlerFunc {
 			return
 		}
 		log.Printf(`%s: category="%s", acl="%s", op="%s"\n`, logTag, *reqCategory, *reqACL, *reqOp)
-
 		// Forward the request to elasticsearch
-		client := util.HTTPClient()
+		client := retryablehttp.NewClient()
 
-		var response *http.Response
-		util.Retry(3, 100*time.Millisecond, func() bool {
-			response, err = client.Do(r)
-			if err != nil {
-				log.Printf("%s: error fetching response for %s: %v\n", logTag, r.URL.Path, err)
-				util.WriteBackError(w, err.Error(), http.StatusInternalServerError)
-				return false
-			}
-			err = nil
-			return true
-		})
+		request, err := retryablehttp.FromRequest(r)
+		if err != nil {
+			log.Printf("%s: error while converting to retryable request for %s: %v\n", logTag, r.URL.Path, err)
+			util.WriteBackError(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+		response, err := client.Do(request)
+
+		if err != nil {
+			log.Printf("%s: error fetching response for %s: %v\n", logTag, r.URL.Path, err)
+			util.WriteBackError(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
 
 		defer response.Body.Close()
 

util/util.go

@@ -230,16 +230,3 @@ func DecodeBase64Key(encoded string) ([]byte, error) {
 	}
 	return decoded, nil
 }
-
-// Retry is a general purpose retrier for a function call
-func Retry(numberRetries int, sleepInterval time.Duration, testFunc func() bool) {
-	executionPassed := false
-	executionCount := 0
-	for !executionPassed && executionCount < numberRetries {
-		executionPassed = testFunc()
-		if !executionPassed {
-			executionCount++
-			time.Sleep(sleepInterval)
-		}
-	}
-}