Make cache config optional, debug logs in cache, fix dispatcher url path

forta-network · Mar 8, 2024 · 119d4a2 · 119d4a2
1 parent 6bb46a0
commit 119d4a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/config/config.go b/config/config.go
@@ -45,7 +45,7 @@ type JsonRpcProxyConfig struct {
 }
 
 type JsonRpcCacheConfig struct {
-	DispatcherURL            string `yaml:"dispatcherUrl" json:"dispatcherUrl" validate:"url"`
+	DispatcherURL            string `yaml:"dispatcherUrl" json:"dispatcherUrl" validate:"omitempty,url"`
 	CacheExpirePeriodSeconds int    `yaml:"cacheExpirePeriodSeconds" json:"cacheExpirePeriodSeconds" default:"300"`
 }
 

diff --git a/services/json-rpc/json_rpc_cache.go b/services/json-rpc/json_rpc_cache.go
@@ -133,7 +133,9 @@ type PresignedURLItem struct {
 func (c *JsonRpcCache) pollEvents() {
 	dispatcherClient := http.DefaultClient
 	dispatcherClient.Timeout = 10 * time.Second
+
 	dispatcherURL, _ := url.Parse(c.cfg.DispatcherURL)
+	dispatcherPath := dispatcherURL.Path
 
 	r2Client := http.DefaultClient
 
@@ -143,14 +145,14 @@ func (c *JsonRpcCache) pollEvents() {
 		log.Info("Polling for combined block events")
 
 		bucket := time.Now().Truncate(time.Second * 10).Unix()
-		dispatcherURL.Path, err = url.JoinPath(dispatcherURL.Path, fmt.Sprintf("%d", bucket))
+		dispatcherURL.Path, err = url.JoinPath(dispatcherPath, fmt.Sprintf("%d", bucket))
 		if err != nil {
 			continue
 		}
 
 		resp, err := dispatcherClient.Get(dispatcherURL.String())
 		if err != nil {
-			log.WithError(err).Error("Failed to get R2 url from dispatcher")
+			log.WithError(err).Debug("Failed to get R2 url from dispatcher")
 			continue
 		}