Accept Redis db variable

topfreegames · May 29, 2017 · 3de446f · 3de446f
1 parent 5372d7e
commit 3de446f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -17,6 +17,7 @@ ENV MQTTHISTORY_ELASTICSEARCH_SNIFF false
 
 ENV MQTTHISTORY_REDIS_HOST localhost
 ENV MQTTHISTORY_REDIS_PORT 6379
+ENV MQTTHISTORY_REDIS_DB 0
 ENV MQTTHISTORY_API_TLS false
 ENV MQTTHISTORY_API_CERTFILE ./misc/example.crt
 ENV MQTTHISTORY_API_KEYFILE ./misc/example.key

diff --git a/config/local.yaml b/config/local.yaml
@@ -11,5 +11,6 @@ redis:
   port: 4444
   password: ""
   maxPoolSize: 10
+  db: 0
 logger:
   level: "debug"
diff --git a/config/test.yaml b/config/test.yaml
@@ -11,5 +11,6 @@ redis:
   port: 4444
   password: ""
   maxPoolSize: 10
+  db: 0
 logger:
   level: "debug"
diff --git a/redisclient/redisclient.go b/redisclient/redisclient.go
@@ -29,13 +29,13 @@ func GetRedisClient(redisHost string, redisPort int, redisPass string) *RedisCli
 		client.Pool = redis.NewPool(func() (redis.Conn, error) {
 			if viper.GetString("redis.password") != "" {
 				c, err := redis.Dial("tcp", fmt.Sprintf("%s:%d", viper.GetString("redis.host"),
-					viper.GetInt("redis.port")), redis.DialPassword(viper.GetString("redis.password")))
+					viper.GetInt("redis.port")), redis.DialPassword(viper.GetString("redis.password")), redis.DialDatabase(viper.GetInt("redis.db")))
 				if err != nil {
 					logger.Logger.Error(err.Error())
 				}
 				return c, err
 			}
-			c, err := redis.Dial("tcp", redisAddress)
+			c, err := redis.Dial("tcp", redisAddress, redis.DialDatabase(viper.GetInt("redis.db")))
 			if err != nil {
 				if err != nil {
 					logger.Logger.Error(err.Error())