Merge pull request #61 from mysteriumnetwork/allow-redis-cluster

universal client for sidecar too
mysteriumnetwork · Jul 27, 2022 · ee8ecb3 · ee8ecb3
2 parents ce29cfc + dc90766
commit ee8ecb3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/price/pricing/price_updater.go b/price/pricing/price_updater.go
@@ -27,10 +27,10 @@ type FiatPriceAPI interface {
 }
 
 type PriceUpdater struct {
-	priceAPI              FiatPriceAPI
-	priceLifetime         time.Duration
-	mystBound             Bound
-	db                    *redis.Client
+	priceAPI      FiatPriceAPI
+	priceLifetime time.Duration
+	mystBound     Bound
+	db            redis.UniversalClient
 
 	lock        sync.Mutex
 	lp          LatestPrices
@@ -45,15 +45,15 @@ func NewPricer(
 	priceAPI FiatPriceAPI,
 	priceLifetime time.Duration,
 	sensibleMystBound Bound,
-	db *redis.Client,
+	db redis.UniversalClient,
 ) (*PriceUpdater, error) {
 	pricer := &PriceUpdater{
-		cfgProvider:           cfgProvider,
-		priceAPI:              priceAPI,
-		priceLifetime:         priceLifetime,
-		mystBound:             sensibleMystBound,
-		stop:                  make(chan struct{}),
-		db:                    db,
+		cfgProvider:   cfgProvider,
+		priceAPI:      priceAPI,
+		priceLifetime: priceLifetime,
+		mystBound:     sensibleMystBound,
+		stop:          make(chan struct{}),
+		db:            db,
 	}
 
 	go pricer.schedulePriceUpdate(priceLifetime)

diff --git a/sidecar/cmd/main.go b/sidecar/cmd/main.go
@@ -9,6 +9,7 @@ import (
 	"os"
 	"os/signal"
 	"strconv"
+	"strings"
 	"syscall"
 	"time"
 
@@ -33,8 +34,8 @@ func main() {
 		log.Fatal().Err(err).Msg("Failed to read config")
 	}
 
-	rdb := redis.NewClient(&redis.Options{
-		Addr:     cfg.RedisAddress,
+	rdb := redis.NewUniversalClient(&redis.UniversalOptions{
+		Addrs:    cfg.RedisAddress,
 		Password: cfg.RedisPass,
 		DB:       cfg.RedisDB,
 	})
@@ -138,7 +139,7 @@ func configureLogger() {
 }
 
 type Options struct {
-	RedisAddress     string
+	RedisAddress     []string
 	RedisPass        string
 	RedisDB          int
 	QualityOracleURL url.URL
@@ -182,7 +183,7 @@ func ReadConfig() (*Options, error) {
 		return nil, err
 	}
 	return &Options{
-		RedisAddress:     redisAddress,
+		RedisAddress:     strings.Split(redisAddress, ";"),
 		RedisPass:        redisPass,
 		RedisDB:          redisDBint,
 		QualityOracleURL: *qualityOracleURL,