Merge pull request #2581 from Budibase/fix/enable-redis-ssl
Fix/enable redis ssl
This commit is contained in:
commit
26cfc9eabc
|
@ -56,9 +56,13 @@ function init() {
|
|||
if (CLIENT) {
|
||||
CLIENT.disconnect()
|
||||
}
|
||||
const { opts, host, port } = getRedisOptions(CLUSTERED)
|
||||
|
||||
const { redisProtocolUrl, opts, host, port } = getRedisOptions(CLUSTERED)
|
||||
|
||||
if (CLUSTERED) {
|
||||
CLIENT = new Redis.Cluster([{ host, port }], opts)
|
||||
} else if (redisProtocolUrl) {
|
||||
CLIENT = new Redis(redisProtocolUrl)
|
||||
} else {
|
||||
CLIENT = new Redis(opts)
|
||||
}
|
||||
|
|
|
@ -19,6 +19,14 @@ exports.SEPARATOR = SEPARATOR
|
|||
|
||||
exports.getRedisOptions = (clustered = false) => {
|
||||
const [host, port] = REDIS_URL.split(":")
|
||||
|
||||
let redisProtocolUrl
|
||||
|
||||
// fully qualified redis URL
|
||||
if (/rediss?/.test(host)) {
|
||||
redisProtocolUrl = REDIS_URL
|
||||
}
|
||||
|
||||
const opts = {
|
||||
connectTimeout: CONNECT_TIMEOUT_MS,
|
||||
}
|
||||
|
@ -33,7 +41,7 @@ exports.getRedisOptions = (clustered = false) => {
|
|||
opts.port = port
|
||||
opts.password = REDIS_PASSWORD
|
||||
}
|
||||
return { opts, host, port }
|
||||
return { opts, host, port, redisProtocolUrl }
|
||||
}
|
||||
|
||||
exports.addDbPrefix = (db, key) => {
|
||||
|
|
Loading…
Reference in New Issue