From af572d7dc231e2835d4235dd7b138ccd0164e8ac Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@ess.eu>
Date: Tue, 27 Oct 2020 08:21:15 +0100
Subject: [PATCH] Force RQ_DASHBOARD_REDIS_URL to RQ_REDIS_URL
RQ_DASHBOARD_REDIS_URL can't be set to RD_REDIS_URL in setting.py.
If RQ_REDIS_URL is changed in settings.cfg, that wouldn't update
RQ_DASHBOARD_REDIS_URL.
JIRA INFRA-2754 #action In Progress
---
app/factory.py | 3 +++
app/settings.py | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/factory.py b/app/factory.py
index 13fe828..ffb76bb 100644
--- a/app/factory.py
+++ b/app/factory.py
@@ -107,6 +107,9 @@ def create_app(config=None):
)
app.logger.info(f"Settings:\n{settings_string}")
+ # Force RQ_DASHBOARD_REDIS_URL to RQ_REDIS_URL
+ app.config["RQ_DASHBOARD_REDIS_URL"] = app.config["RQ_REDIS_URL"]
+
db.init_app(app)
migrate.init_app(app)
login_manager.init_app(app)
diff --git a/app/settings.py b/app/settings.py
index cbdced7..a5abc9f 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -33,7 +33,6 @@ SESSION_REDIS_URL = "redis://redis:6379/0"
CACHE_TYPE = "redis"
CACHE_REDIS_URL = "redis://redis:6379/1"
RQ_REDIS_URL = "redis://redis:6379/2"
-RQ_DASHBOARD_REDIS_URL = RQ_REDIS_URL
ELASTICSEARCH_URL = "http://elasticsearch:9200"
ELASTICSEARCH_INDEX_SUFFIX = "-dev"
--
GitLab