fix validation of retry

main.go

@@ -32,8 +32,8 @@ func main() {
  e.Use(middlewares.RateLimit(config))
  e.Use(middlewares.DenyRoutes(config))
  e.Use(middlewares.Cache(config))
- e.Use(middlewares.Gzip(config))
  e.Use(middlewares.Retry(config))
+ e.Use(middlewares.Gzip(config))
  e.Use(middleware.ProxyWithConfig(*config.ProxyConfig))
 
  // Start metrics server

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,12 @@ func Retry(config *utils.Config) echo.MiddlewareFunc {
  err = next(c)
 
  status := c.Response().Status
- if status == 404 || status == 410 {
+ if status == 404 || status == 410 &&
+ strings.Contains(c.Request().URL.Path, "blocks") {
  c.Set("retry", true)
  return next(c)
+ } else {
+ c.Set("retry", false)
  }
 
  return err

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
  }
 
@@ -67,16 +67,14 @@ func (b *sameNodeBalancer) Next(c echo.Context) *middleware.ProxyTarget {
  return b.targets[0]
  }
 
- var i int
- ipKey := []byte(c.RealIP())
-
- got, err := b.store.Get(c.Request().Context(), ipKey)
+ ctx := c.Request().Context()
+ ip := []byte(c.RealIP())
+ got, err := b.store.Get(ctx, ip)
  if err != nil {
- i = b.random.Intn(len(b.targets))
- b.store.Set(c.Request().Context(), ipKey, []byte{byte(i)}, b.TTL)
- } else {
- i = int(got[0])
+ i := b.random.Intn(len(b.targets))
+ b.store.Set(ctx, ip, []byte{byte(i)}, b.TTL)
+ return b.targets[i]
  }
 
- return b.targets[i]
+ return b.targets[int(got[0])]
 }