Added support for Redis tls

SurveyLegend · Nov 28, 2019 · be8705c · be8705c
1 parent dcb4efd
commit be8705c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.env.example b/.env.example
@@ -5,6 +5,7 @@ REDIS_HOST=127.0.0.1
 REDIS_PORT=6379
 REDIS_DATABASE=0
 #REDIS_PASS=
+#REDIS_TLS=true
 
 SLACK_WEBHOOK_URL=https://hooks.slack.com/services/...
 SLACK_CHANNEL="#my-channel"
diff --git a/clean_completed_jobs.js b/clean_completed_jobs.js
@@ -10,14 +10,18 @@ const { forEach } = require('p-iteration')
 const REDIS_PORT = Number.parseInt(process.env.REDIS_PORT) || 6379
 const REDIS_HOST = process.env.REDIS_HOST || '127.0.0.1'
 const REDIS_DATABASE = Number.parseInt(process.env.REDIS_DATABASE) || 0
+const REDIS_PASS = process.env.REDIS_PASS
+const REDIS_TLS = process.env.REDIS_TLS && `${process.env.REDIS_TLS}` === 'true'
 
 const JOB_AGE = Number.parseInt(process.env.JOB_AGE) || 5000
 
 const REDIS_CONFIG = {
     redis: {
         port: REDIS_PORT,
         host: REDIS_HOST,
-        db: REDIS_DATABASE
+        db: REDIS_DATABASE,
+        password: REDIS_PASS,
+        tls: REDIS_TLS ? {} : null
     }
 }
 

diff --git a/retry_failed_jobs.js b/retry_failed_jobs.js
@@ -11,19 +11,18 @@ const REDIS_PORT = Number.parseInt(process.env.REDIS_PORT) || 6379
 const REDIS_HOST = process.env.REDIS_HOST || '127.0.0.1'
 const REDIS_DATABASE = Number.parseInt(process.env.REDIS_DATABASE) || 0
 const REDIS_PASS = process.env.REDIS_PASS
+const REDIS_TLS = process.env.REDIS_TLS && `${process.env.REDIS_TLS}` === 'true'
 
 const REDIS_CONFIG = {
     redis: {
         port: REDIS_PORT,
         host: REDIS_HOST,
-        db: REDIS_DATABASE
+        db: REDIS_DATABASE,
+        password: REDIS_PASS,
+        tls: REDIS_TLS ? {} : null
     }
 }
 
-if (REDIS_PASS) {
-    REDIS_CONFIG.redis.password = REDIS_PASS
-}
-
 const args = process.argv.slice(2)
 
 if (args.length < 1) {