aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/redis.ts
diff options
context:
space:
mode:
Diffstat (limited to 'server/lib/redis.ts')
-rw-r--r--server/lib/redis.ts16
1 files changed, 11 insertions, 5 deletions
diff --git a/server/lib/redis.ts b/server/lib/redis.ts
index 78b28986a..06a340060 100644
--- a/server/lib/redis.ts
+++ b/server/lib/redis.ts
@@ -24,11 +24,7 @@ class Redis {
24 if (this.initialized === true) return 24 if (this.initialized === true) return
25 this.initialized = true 25 this.initialized = true
26 26
27 this.client = createClient({ 27 this.client = createClient(Redis.getRedisClient())
28 host: CONFIG.REDIS.HOSTNAME,
29 port: CONFIG.REDIS.PORT,
30 db: CONFIG.REDIS.DB
31 })
32 28
33 this.client.on('error', err => { 29 this.client.on('error', err => {
34 logger.error('Error in Redis client.', { err }) 30 logger.error('Error in Redis client.', { err })
@@ -42,6 +38,16 @@ class Redis {
42 this.prefix = 'redis-' + CONFIG.WEBSERVER.HOST + '-' 38 this.prefix = 'redis-' + CONFIG.WEBSERVER.HOST + '-'
43 } 39 }
44 40
41 static getRedisClient () {
42 return Object.assign({},
43 (CONFIG.REDIS.AUTH && CONFIG.REDIS.AUTH != null) ? { password: CONFIG.REDIS.AUTH } : {},
44 (CONFIG.REDIS.DB) ? { db: CONFIG.REDIS.DB } : {},
45 (CONFIG.REDIS.HOSTNAME && CONFIG.REDIS.PORT) ?
46 { host: CONFIG.REDIS.HOSTNAME, port: CONFIG.REDIS.PORT } :
47 { path: CONFIG.REDIS.SOCKET }
48 )
49 }
50
45 async setResetPasswordVerificationString (userId: number) { 51 async setResetPasswordVerificationString (userId: number) {
46 const generatedString = await generateRandomString(32) 52 const generatedString = await generateRandomString(32)
47 53