From 900937ee5f1d4a63191ecc9994351eea8e888f47 Mon Sep 17 00:00:00 2001
From: Jade Meskill <jade.meskill@gmail.com>
Date: Thu, 13 Jan 2022 09:15:24 -0700
Subject: [PATCH] use REDIS_x_DB_INDEX instead of REDIS_x_DB, add optional
 setting to example env file

---
 .env.example                                  | 4 ++++
 bookwyrm/management/commands/erase_streams.py | 2 +-
 bookwyrm/redis_store.py                       | 2 +-
 bookwyrm/settings.py                          | 4 ++--
 celerywyrm/settings.py                        | 6 +++---
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.env.example b/.env.example
index 3c935287e..2000a7165 100644
--- a/.env.example
+++ b/.env.example
@@ -28,10 +28,14 @@ MAX_STREAM_LENGTH=200
 REDIS_ACTIVITY_HOST=redis_activity
 REDIS_ACTIVITY_PORT=6379
 REDIS_ACTIVITY_PASSWORD=redispassword345
+# Optional, use a different redis database (defaults to 0)
+# REDIS_ACTIVITY_DB_INDEX=0
 
 # Redis as celery broker
 REDIS_BROKER_PORT=6379
 REDIS_BROKER_PASSWORD=redispassword123
+# Optional, use a different redis database (defaults to 0)
+# REDIS_BROKER_DB_INDEX=0
 
 # Monitoring for celery
 FLOWER_PORT=8888
diff --git a/bookwyrm/management/commands/erase_streams.py b/bookwyrm/management/commands/erase_streams.py
index ed9987c49..7b8074029 100644
--- a/bookwyrm/management/commands/erase_streams.py
+++ b/bookwyrm/management/commands/erase_streams.py
@@ -7,7 +7,7 @@ from bookwyrm import settings
 r = redis.Redis(
     host=settings.REDIS_ACTIVITY_HOST,
     port=settings.REDIS_ACTIVITY_PORT,
-    db=settings.REDIS_ACTIVITY_DB,
+    db=settings.REDIS_ACTIVITY_DB_INDEX,
 )
 
 
diff --git a/bookwyrm/redis_store.py b/bookwyrm/redis_store.py
index 560527c92..ae50db2ee 100644
--- a/bookwyrm/redis_store.py
+++ b/bookwyrm/redis_store.py
@@ -8,7 +8,7 @@ r = redis.Redis(
     host=settings.REDIS_ACTIVITY_HOST,
     port=settings.REDIS_ACTIVITY_PORT,
     password=settings.REDIS_ACTIVITY_PASSWORD,
-    db=settings.REDIS_ACTIVITY_DB,
+    db=settings.REDIS_ACTIVITY_DB_INDEX,
 )
 
 
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 22717f783..a91630efa 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -113,7 +113,7 @@ WSGI_APPLICATION = "bookwyrm.wsgi.application"
 REDIS_ACTIVITY_HOST = env("REDIS_ACTIVITY_HOST", "localhost")
 REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379)
 REDIS_ACTIVITY_PASSWORD = env("REDIS_ACTIVITY_PASSWORD", None)
-REDIS_ACTIVITY_DB = env("REDIS_ACTIVITY_DB", 0)
+REDIS_ACTIVITY_DB_INDEX = env("REDIS_ACTIVITY_DB_INDEX", 0)
 
 MAX_STREAM_LENGTH = int(env("MAX_STREAM_LENGTH", 200))
 
@@ -140,7 +140,7 @@ else:
     CACHES = {
         "default": {
             "BACKEND": "django_redis.cache.RedisCache",
-            "LOCATION": f"redis://:{REDIS_ACTIVITY_PASSWORD}@{REDIS_ACTIVITY_HOST}:{REDIS_ACTIVITY_PORT}/{REDIS_ACTIVITY_DB}",
+            "LOCATION": f"redis://:{REDIS_ACTIVITY_PASSWORD}@{REDIS_ACTIVITY_HOST}:{REDIS_ACTIVITY_PORT}/{REDIS_ACTIVITY_DB_INDEX}",
             "OPTIONS": {
                 "CLIENT_CLASS": "django_redis.client.DefaultClient",
             },
diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py
index 11f3acf45..bd7805e51 100644
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@@ -6,10 +6,10 @@ from bookwyrm.settings import *
 REDIS_BROKER_PASSWORD = requests.utils.quote(env("REDIS_BROKER_PASSWORD", None))
 REDIS_BROKER_HOST = env("REDIS_BROKER_HOST", "redis_broker")
 REDIS_BROKER_PORT = env("REDIS_BROKER_PORT", 6379)
-REDIS_BROKER_DB = env("REDIS_BROKER_DB", 0)
+REDIS_BROKER_DB_INDEX = env("REDIS_BROKER_DB_INDEX", 0)
 
-CELERY_BROKER_URL = f"redis://:{REDIS_BROKER_PASSWORD}@{REDIS_BROKER_HOST}:{REDIS_BROKER_PORT}/{REDIS_BROKER_DB}"
-CELERY_RESULT_BACKEND = f"redis://:{REDIS_BROKER_PASSWORD}@{REDIS_BROKER_HOST}:{REDIS_BROKER_PORT}/{REDIS_BROKER_DB}"
+CELERY_BROKER_URL = f"redis://:{REDIS_BROKER_PASSWORD}@{REDIS_BROKER_HOST}:{REDIS_BROKER_PORT}/{REDIS_BROKER_DB_INDEX}"
+CELERY_RESULT_BACKEND = f"redis://:{REDIS_BROKER_PASSWORD}@{REDIS_BROKER_HOST}:{REDIS_BROKER_PORT}/{REDIS_BROKER_DB_INDEX}"
 
 CELERY_DEFAULT_QUEUE = "low_priority"