From 9e728b8de205d92b5bfa11fa0bd9e50b60cd067f Mon Sep 17 00:00:00 2001
From: Craig P Steffen <craigsteffen@gmail.com>
Date: Tue, 13 Aug 2024 16:05:16 -0500
Subject: [PATCH] URI def cleanup

Cleaned out some deprecated URI definition code that wasn't used any
more.
---
 downloader/CM_B_downloader.py | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/downloader/CM_B_downloader.py b/downloader/CM_B_downloader.py
index 4cd247e..d859d3f 100755
--- a/downloader/CM_B_downloader.py
+++ b/downloader/CM_B_downloader.py
@@ -48,25 +48,6 @@
 # RABBITMQ_URI *must* be defined in the incoming environment otherwise all the rabbitmq features will not work.  
 rabbitmq_uri = os.getenv("RABBITMQ_URI", "amqp://guest:guest@localhost:5672/%2F")
 
-###############
-# this is only here because the include isn't working
-
-RMQ_username = "criticalmaas"
-RMQ_password = "keeNgoo1VahthuS4ii1r"
-
-#
-##############
-
-def set_up_RMQ(secrets_file):
-    global rabbitmq_uri
-    #    global RMQ_username
-#    global RMQ_password
-    
-#    if os.path.exists(secrets_file):
-#        execfile(filename)
-#    rabbitmq_uri = f"amqp://{RMQ_username}:{RMQ_password}@rabbitmq.criticalmaas.software-dev.ncsa.illinois.edu:5672/shepard"
-    return rabbitmq_uri
-
 # the downloader worker class
 class DL_worker(threading.Thread):
     output_model_list = []
@@ -287,6 +268,7 @@ def main(argv):
     my_output_dir=""
     my_model_name=""
 
+    global rabbitmq_uri
     global my_log_dir
     global my_pipeline_image
     global download_queue
@@ -300,9 +282,6 @@ def main(argv):
     print("input file:>"+my_input_file+"<")
     print("output directory:>"+my_output_dir+"<")
 
-    # set up consumer
-    rabbitmq_uri=set_up_RMQ("~/.criticalmaas/secrets")
-
     parameters = pika.URLParameters(rabbitmq_uri)
     print('About to open rabbitMQ connection')
     connection = pika.BlockingConnection(parameters)