Merge pull request #40 from meedan/cv2-3435-fix-queue-name

CV2-3435 update env var, dedupe queue name
meedan · Oct 11, 2023 · 62fa98e · 62fa98e
2 parents 6f65247 + 27d404a
commit 62fa98e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.env_file b/.env_file
@@ -1,3 +1,4 @@
+QUEUE_PREFIX=dev_
 PRESTO_PORT=8000
 DEPLOY_ENV=local
 # MODEL_NAME=mean_tokens.Model

diff --git a/lib/helpers.py b/lib/helpers.py
@@ -4,9 +4,8 @@
 def get_environment_setting(os_key: str) -> str:
     """
     Get environment variable helper. Could be augmented with credential store if/when necessary.
-    Default to blank string as any .get on environ will result in string, so better to not create a None raise error
     """
-    return os.environ.get(os_key, "")
+    return os.environ.get(os_key)
 
 def get_setting(current_value: Any, default_os_key: str) -> Any:
     """

diff --git a/lib/queue/worker.py b/lib/queue/worker.py
@@ -14,7 +14,7 @@ def create(cls, input_queue_name: str = None):
         """
         queue_prefix = get_setting("", "QUEUE_PREFIX").replace(".", "__")
         input_queue_name = queue_prefix+get_setting(input_queue_name, "MODEL_NAME").replace(".", "__")
-        output_queue_name = f"{queue_prefix}{input_queue_name}_output"
+        output_queue_name = f"{input_queue_name}_output"
         logger.info(f"Starting queue with: ('{input_queue_name}', '{output_queue_name}')")
         return QueueWorker(input_queue_name, output_queue_name)