From d266756d26e78e77b99515802de51ec1151a7abb Mon Sep 17 00:00:00 2001
From: BonfaceKilz
Date: Wed, 24 Feb 2021 18:17:06 +0300
Subject: Make the name of the redis job queue configurable

---
 gn3/api/gemma.py | 1 +
 gn3/commands.py  | 5 +++--
 gn3/settings.py  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'gn3')

diff --git a/gn3/api/gemma.py b/gn3/api/gemma.py
index c145eb4..bdba26e 100644
--- a/gn3/api/gemma.py
+++ b/gn3/api/gemma.py
@@ -68,6 +68,7 @@ file output is returned.
     return jsonify(
         unique_id=queue_cmd(conn=redis.Redis(),
                             email=data.get("email"),
+                            job_queue=app_defaults.get("REDIS_JOB_QUEUE"),
                             cmd=f"{k_computation_cmd} && {gwa_cmd}"),
         status="queued",
         output_file=(f"{data.get('dataset_name')}_GWA_"
diff --git a/gn3/commands.py b/gn3/commands.py
index 51c1582..70ef2cf 100644
--- a/gn3/commands.py
+++ b/gn3/commands.py
@@ -33,7 +33,8 @@ def compose_gemma_cmd(
     return cmd
 
 
-def queue_cmd(conn: Redis, cmd: str, email: Optional[str] = None) -> str:
+def queue_cmd(conn: Redis, job_queue: str,
+              cmd: str, email: Optional[str] = None) -> str:
     """Given a command CMD; (optional) EMAIL; and a redis connection CONN, queue
 it in Redis with an initial status of 'queued'.  The following status codes
 are supported:
@@ -53,7 +54,7 @@ are supported:
                        "result": "",
                        "status": "queued"}.items():
         conn.hset(key, value, unique_id)
-        conn.rpush("GN2::job-queue",
+        conn.rpush(job_queue,
                    unique_id)
     if email:
         conn.hset("email",
diff --git a/gn3/settings.py b/gn3/settings.py
index 6a67c0a..ddff766 100644
--- a/gn3/settings.py
+++ b/gn3/settings.py
@@ -8,5 +8,6 @@ APP_DEFAULTS = {
     "GEMMA_WRAPPER_CMD": os.environ.get("GEMMA_WRAPPER", "gemma-wrapper"),
     "TMPDIR": os.environ.get("TMPDIR", tempfile.gettempdir()),
     "GENODIR": "",
-    "REDIS_URI": "redis://localhost:6379/0"
+    "REDIS_URI": "redis://localhost:6379/0",
+    "REDIS_JOB_QUEUE": "GN3::job-queue"
 }
-- 
cgit v1.2.3