fix: tests

README.md

@@ -208,7 +208,7 @@ This section does not describe permanent API contracts; it just describes limita
 
 ## Backend Configuration
 
-Prebid Cache requires a backend data store which enforces TTL expiration. The following storage options are supported: Aerospike, Cassandra, Memcache, and Redis. You're welcomed to contribute a new backend adapter if needed. 
+Prebid Cache requires a backend data store which enforces TTL expiration. The following storage options are supported: Aerospike, Cassandra, Memcache, and Redis/Redis sentinel. You're welcomed to contribute a new backend adapter if needed.
 
 There is also an option (enabled by default) for a basic in-memory data store intended only for development. This backend does not support TTL expiration and is not built for production use.
 
@@ -383,4 +383,4 @@ docker run -p 8000:8000 -t prebid-cache
 
 ### Profiling
 
-[pprof stats](http://artem.krylysov.com/blog/2017/03/13/profiling-and-optimizing-go-web-applications/) can be accessed from a running app on the admin port `localhost:2525`.
+[pprof stats](http://artem.krylysov.com/blog/2017/03/13/profiling-and-optimizing-go-web-applications/) can be accessed from a running app on the admin port `localhost:2525`.

backends/config/config_test.go

@@ -149,6 +149,8 @@ func TestNewBaseBackend(t *testing.T) {
 			desc:     "Redis",
 			inConfig: config.Backend{Type: config.BackendRedis},
 			expectedLogEntries: []logEntry{
+				{msg: "Error creating Redis backend: At least one Host[s] is required.", lvl: logrus.FatalLevel},
+				{msg: "Creating Redis backend", lvl: logrus.InfoLevel},
 				{msg: "Error creating Redis backend: ", lvl: logrus.FatalLevel},
 			},
 		},

backends/redis.go

@@ -49,14 +49,17 @@ type RedisBackend struct {
 func NewRedisBackend(cfg config.Redis, ctx context.Context) *RedisBackend {
 
 	if len(cfg.Hosts) < 1 || cfg.Host == "" {
-		log.Fatalf("At least one Host[s] is required.")
+		log.Fatalf("Error creating Redis backend: At least one Host[s] is required.")
 	}
 
 	var redisClient RedisDBClient
 
+	sentinel := false
+
 	if cfg.MasterName != "" {
-		log.Info("Creating Redis sentinel backend")
+		sentinel = true
 		// Mode failover (sentinel)
+		log.Info("Creating Redis sentinel backend")
 		options := &redis.FailoverOptions{
 			MasterName:       cfg.MasterName,
 			SentinelAddrs:    cfg.Hosts,
@@ -70,10 +73,9 @@ func NewRedisBackend(cfg config.Redis, ctx context.Context) *RedisBackend {
 		}
 
 		redisClient = RedisDBClient{client: redis.NewFailoverClient(options)}
-
 	} else {
-		log.Info("Creating Redis backend")
 		// Mode single
+		log.Info("Creating Redis backend")
 		constr := cfg.Host + ":" + strconv.Itoa(cfg.Port)
 		options := &redis.Options{
 			Addr:     constr,
@@ -96,7 +98,11 @@ func NewRedisBackend(cfg config.Redis, ctx context.Context) *RedisBackend {
 		panic("RedisBackend failure. This shouldn't happen.")
 	}
 
-	log.Infof("Connected to Redis at %s:%d", cfg.Host, cfg.Port)
+	if sentinel {
+		log.Infof("Connected to Redis: %v", cfg.Hosts)
+	} else {
+		log.Infof("Connected to Redis: %s:%v", cfg.Host, cfg.Port)
+	}
 
 	return &RedisBackend{
 		cfg:    cfg,

config/backends.go

@@ -152,13 +152,13 @@ func (cfg *Memcache) validateAndLog() error {
 
 type Redis struct {
 	Host              string   `mapstructure:"host"`
-	Hosts             []string `mapstructure:"hosts"`
-	MasterName        string   `mapstructure:"mastername"`
 	Port              int      `mapstructure:"port"`
 	Password          string   `mapstructure:"password"`
 	Db                int      `mapstructure:"db"`
 	ExpirationMinutes int      `mapstructure:"expiration"`
 	TLS               RedisTLS `mapstructure:"tls"`
+	Hosts             []string `mapstructure:"hosts"`
+	MasterName        string   `mapstructure:"mastername"`
 }
 
 type RedisTLS struct {
@@ -167,8 +167,13 @@ type RedisTLS struct {
 }
 
 func (cfg *Redis) validateAndLog() error {
-	log.Infof("config.backend.redis.host: %s", cfg.Host)
-	log.Infof("config.backend.redis.port: %d", cfg.Port)
+	if cfg.Host != "" && len(cfg.Hosts) > 0 {
+		log.Infof("config.backend.redis.hosts: %s. Note that redis host will be ignore if 'hosts' is define", cfg.Hosts)
+		log.Infof("config.backend.redis.mastername: %s.", cfg.MasterName)
+	} else {
+		log.Infof("config.backend.redis.host: %s", cfg.Host)
+		log.Infof("config.backend.redis.port: %d", cfg.Port)
+	}
 	log.Infof("config.backend.redis.db: %d", cfg.Db)
 	if cfg.ExpirationMinutes > 0 {
 		log.Infof("config.backend.redis.expiration: %d. Note that this configuration option is being deprecated in favor of config.request_limits.max_ttl_seconds", cfg.ExpirationMinutes)

config/config_test.go

@@ -1202,6 +1202,7 @@ func getExpectedDefaultConfig() Configuration {
 				DefaultTTL: utils.CASSANDRA_DEFAULT_TTL_SECONDS,
 			},
 			Redis: Redis{
+				Hosts:             []string{},
 				ExpirationMinutes: utils.REDIS_DEFAULT_EXPIRATION_MINUTES,
 			},
 			Ignite: Ignite{
@@ -1267,8 +1268,12 @@ func getExpectedFullConfigForTestFile() Configuration {
 				Hosts: []string{"10.0.0.1:11211", "127.0.0.1"},
 			},
 			Redis: Redis{
-				Host:              "127.0.0.1",
-				Port:              6379,
+				Host: "127.0.0.1",
+				Port: 6379,
+				Hosts: []string{
+					"10.0.0.1:26379", "127.0.0.1",
+				},
+				MasterName:        "mymaster",
 				Password:          "redis-password",
 				Db:                1,
 				ExpirationMinutes: 1,

config/configtest/sample_full_config.yaml

@@ -27,8 +27,12 @@ backend:
     keyspace: "prebid"
     default_ttl_seconds: 60
   memcache:
-    hosts: ["10.0.0.1:11211","127.0.0.1"]
+    hosts: ["10.0.0.1:11211", "127.0.0.1"]
   redis:
+    hosts:
+      - "10.0.0.1:26379"
+      - "127.0.0.1"
+    mastername: "mymaster"
     host: "127.0.0.1"
     port: 6379
     password: "redis-password"