Made redis version configurable for IBM Bluemix RedisCloud

cwjohan · Oct 31, 2014 · a3f754e · a3f754e
1 parent a77cba4
commit a3f754e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/lib/connStrategyBlueMixRedisCloud.js b/lib/connStrategyBlueMixRedisCloud.js
@@ -9,11 +9,12 @@ ConnStrategyCustom = (function() {
   function ConnStrategyCustom() {}
 
   ConnStrategyCustom.prototype.getClient = function(config) {
-    var credentials, env, redisHost, redisOptions, redisPort;
+    var credentials, env, redisHost, redisOptions, redisPort, redisVersion;
     this.config = config;
     if (process.env.VCAP_SERVICES) {
       env = JSON.parse(process.env.VCAP_SERVICES);
-      credentials = env['redis-2.6'][0].credentials;
+      redisVersion = this.config.redis_version || 'redis-2.6';
+      credentials = env[redisVersion][0].credentials;
       redisOptions = this.config.redis_options;
       this.client = redis.createClient(credentials.port, credentials.host, redisOptions);
       if (credentials.password) {

diff --git a/sample-configs/redis-queue-config-bluemix-redis-cloud.json b/sample-configs/redis-queue-config-bluemix-redis-cloud.json
@@ -1,9 +1,10 @@
 {
-  "verbose": false,
+  "verbose": true,
   "redis_provider": {
     "type": "BlueMixRedisCloud"
   },
   "redis_options": {
+    "redis_version": "redis-2.6",
     "retry_max_delay": 2000
   }
 }
diff --git a/src/connStrategyBlueMixRedisCloud.coffee b/src/connStrategyBlueMixRedisCloud.coffee
@@ -5,7 +5,8 @@ class ConnStrategyCustom
   getClient: (@config) ->
     if process.env.VCAP_SERVICES
       env = JSON.parse process.env.VCAP_SERVICES
-      credentials = env['redis-2.6'][0].credentials
+      redisVersion = @config.redis_version or 'redis-2.6'
+      credentials = env[redisVersion][0].credentials
       redisOptions = @config.redis_options
       @client = redis.createClient credentials.port, credentials.host, redisOptions
       @client.auth credentials.password if credentials.password