fix(proxyd): clean up cache initialization
This commit is contained in:
parent
3ab4152802
commit
7950eb9d7d
@ -26,9 +26,7 @@ type ServerConfig struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type CacheConfig struct {
|
type CacheConfig struct {
|
||||||
Enabled bool `toml:"enabled"`
|
Enabled bool `toml:"enabled"`
|
||||||
BlockSyncRPCURL string `toml:"block_sync_rpc_url"`
|
|
||||||
NumBlockConfirmations int `toml:"num_block_confirmations"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type RedisConfig struct {
|
type RedisConfig struct {
|
||||||
|
@ -9,7 +9,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum/common/math"
|
"github.com/ethereum/go-ethereum/common/math"
|
||||||
"github.com/ethereum/go-ethereum/ethclient"
|
|
||||||
"github.com/ethereum/go-ethereum/log"
|
"github.com/ethereum/go-ethereum/log"
|
||||||
"github.com/go-redis/redis/v8"
|
"github.com/go-redis/redis/v8"
|
||||||
"github.com/prometheus/client_golang/prometheus/promhttp"
|
"github.com/prometheus/client_golang/prometheus/promhttp"
|
||||||
@ -206,27 +205,12 @@ func Start(config *Config) (*Server, func(), error) {
|
|||||||
rpcCache RPCCache
|
rpcCache RPCCache
|
||||||
)
|
)
|
||||||
if config.Cache.Enabled {
|
if config.Cache.Enabled {
|
||||||
if config.Cache.BlockSyncRPCURL == "" {
|
|
||||||
return nil, nil, fmt.Errorf("block sync node required for caching")
|
|
||||||
}
|
|
||||||
blockSyncRPCURL, err := ReadFromEnvOrConfig(config.Cache.BlockSyncRPCURL)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if redisClient == nil {
|
if redisClient == nil {
|
||||||
log.Warn("redis is not configured, using in-memory cache")
|
log.Warn("redis is not configured, using in-memory cache")
|
||||||
cache = newMemoryCache()
|
cache = newMemoryCache()
|
||||||
} else {
|
} else {
|
||||||
cache = newRedisCache(redisClient, config.Redis.Namespace)
|
cache = newRedisCache(redisClient, config.Redis.Namespace)
|
||||||
}
|
}
|
||||||
// Ideally, the BlocKSyncRPCURL should be the sequencer or a HA replica that's not far behind
|
|
||||||
ethClient, err := ethclient.Dial(blockSyncRPCURL)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
defer ethClient.Close()
|
|
||||||
|
|
||||||
rpcCache = newRPCCache(newCacheWithCompression(cache))
|
rpcCache = newRPCCache(newCacheWithCompression(cache))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user