fix validation of retry

marigold-dev · Dec 20, 2023 · 36bcb37 · 36bcb37
1 parent 763bd3e
commit 36bcb37
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/middlewares/retry.go b/middlewares/retry.go
@@ -1,6 +1,8 @@
 package middlewares
 
 import (
+	"strings"
+
 	"github.com/labstack/echo/v4"
 	"github.com/marigold-dev/tzproxy/utils"
 )
@@ -14,9 +16,11 @@ func Retry(config *utils.Config) echo.MiddlewareFunc {
 			err = next(c)
 
 			status := c.Response().Status
-			if status == 404 || status == 410 {
-				c.Set("retry", true)
+			if status == 404 || status == 410 &&
+				strings.Contains(c.Request().URL.Path, "blocks") {
 				return next(c)
+			} else {
+				c.Set("retry", false)
 			}
 
 			return err

diff --git a/utils/balancer.go b/utils/balancer.go
@@ -57,7 +57,7 @@ func (b *sameNodeBalancer) Next(c echo.Context) *middleware.ProxyTarget {
 	b.mutex.Lock()
 	defer b.mutex.Unlock()
 
-	if b.retryTarget != nil && c.Get("retry") != nil {
+	if b.retryTarget != nil && c.Get("retry") != nil && c.Get("retry").(bool) {
 		return b.retryTarget
 	}