aboutsummaryrefslogtreecommitdiff
path: root/gn3
diff options
context:
space:
mode:
Diffstat (limited to 'gn3')
-rw-r--r--gn3/api/gemma.py1
-rw-r--r--gn3/commands.py5
-rw-r--r--gn3/settings.py3
3 files changed, 6 insertions, 3 deletions
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"
}