feature: db selection in redis

resolves #579

diff --git a/config/default.yaml b/config/default.yaml
index 995638281159857b69869345ada0a43ae1215221..8a177e628d925b999c042b0fbc2ae52237bb12ad 100644 (file)
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -25,6 +25,7 @@ redis:
   hostname: 'localhost'
   port: 6379
   auth: null
+  db: 0
 
 smtp:
   hostname: null

diff --git a/config/production.yaml.example b/config/production.yaml.example
index 71344fa35dabcef634cce708c22471870d87bbb6..51d5c51808410ef1386171b11002a18797846fd2 100644 (file)
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -27,6 +27,7 @@ redis:
   hostname: 'localhost'
   port: 6379
   auth: null
+  db: 0
 
 # SMTP server to send emails
 smtp:

diff --git a/server/initializers/checker.ts b/server/initializers/checker.ts
index c11dc7a89c65f19c43f8f40d0c4b5bc433dd6c09..5a9c603b50c73d3534eeededf8101bc40a454b37 100644 (file)
--- a/server/initializers/checker.ts
+++ b/server/initializers/checker.ts
@@ -22,7 +22,7 @@ function checkMissedConfig () {
     'webserver.https', 'webserver.hostname', 'webserver.port',
     'trust_proxy',
     'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password',
-    'redis.hostname', 'redis.port', 'redis.auth',
+    'redis.hostname', 'redis.port', 'redis.auth', 'redis.db',
     'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address',
     'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache',
     'log.level',

diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 51d27289519652246b10e1ef0a0c623b55fcfa09..424947590a0f3e02cc1abcc14f8ce9514c82c80c 100644 (file)
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -111,7 +111,8 @@ const CONFIG = {
   REDIS: {
     HOSTNAME: config.get<string>('redis.hostname'),
     PORT: config.get<number>('redis.port'),
-    AUTH: config.get<string>('redis.auth')
+    AUTH: config.get<string>('redis.auth'),
+    DB: config.get<number>('redis.db')
   },
   SMTP: {
     HOSTNAME: config.get<string>('smtp.hostname'),

diff --git a/server/lib/job-queue/job-queue.ts b/server/lib/job-queue/job-queue.ts
index acc69ef2459c24165628001251a45013e8be7fb0..0333464bd61a12056b92910c283077ab9ea26a42 100644 (file)
--- a/server/lib/job-queue/job-queue.ts
+++ b/server/lib/job-queue/job-queue.ts
@@ -56,7 +56,8 @@ class JobQueue {
       redis: {
         host: CONFIG.REDIS.HOSTNAME,
         port: CONFIG.REDIS.PORT,
-        auth: CONFIG.REDIS.AUTH
+        auth: CONFIG.REDIS.AUTH,
+        db: CONFIG.REDIS.DB
       }
     })
 

diff --git a/server/lib/redis.ts b/server/lib/redis.ts
index 0acb9ff0e4438864041a450e7b5e8afcd8403864..97ff3598b683cacd7510509baac08249070f3bf1 100644 (file)
--- a/server/lib/redis.ts
+++ b/server/lib/redis.ts
@@ -26,7 +26,8 @@ class Redis {
 
     this.client = createClient({
       host: CONFIG.REDIS.HOSTNAME,
-      port: CONFIG.REDIS.PORT
+      port: CONFIG.REDIS.PORT,
+      db: CONFIG.REDIS.DB
     })
 
     this.client.on('error', err => {