Comparing version 1.0.4 to 1.0.5
@@ -36,3 +36,5 @@ /** | ||
var redis = _.assign(require('./defaults/redis')(), userConfig.redis || {}); | ||
if (redis.redisPackage == 'ioredis' && redis.sentinels && redis.sentinels.length) { | ||
// drop port and host from defaults if sentinels array provided | ||
if (redis.redisPackage == 'ioredis' && redis.sentinels && redis.sentinels.length && (userConfig && userConfig.redis && !userConfig.redis.host)) { | ||
delete redis.host; | ||
@@ -42,2 +44,8 @@ delete redis.port; | ||
// if both sentinels and host provided in user config, drop sentinels and default to host only | ||
if (redis.redisPackage == 'ioredis' && redis.sentinels && redis.sentinels.length && (userConfig && userConfig.redis && userConfig.redis.host)) { | ||
delete redis.sentinels; | ||
} | ||
return { | ||
@@ -44,0 +52,0 @@ redis: redis, |
{ | ||
"name": "hive-dev", | ||
"version": "1.0.4", | ||
"version": "1.0.5", | ||
"description": "An intelligent Redis powered, job, worker and queue library with advanced options and plugin support.", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
Sorry, the diff of this file is not supported yet
160402
2985