Merge pull request #256 from PanDAWMS/flin

unifiy config param name of mq
PanDAWMS · Oct 18, 2023 · 869b724 · 869b724
2 parents 16a9b62 + a5de6aa
commit 869b724
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pandaserver/taskbuffer/OraDBProxy.py b/pandaserver/taskbuffer/OraDBProxy.py
@@ -94,7 +94,7 @@
 # get mb proxies used in DBProxy methods
 def get_mb_proxy_dict():
     try:
-        if hasattr(panda_config, "mbproxy_configFile") and panda_config.mbproxy_configFile:
+        if hasattr(panda_config, "mq_configFile") and panda_config.mq_configFile:
             # delay import to open logger file inside python daemon
             from pandaserver.taskbuffer.PanDAMsgProcessor import MsgProcAgent
 
@@ -104,7 +104,7 @@ def get_mb_proxy_dict():
                 "panda_pilot_topic",
                 "panda_pilot_queue",
             ]
-            mp_agent = MsgProcAgent(config_file=panda_config.mbproxy_configFile)
+            mp_agent = MsgProcAgent(config_file=panda_config.mq_configFile)
             mb_proxy_dict = mp_agent.start_passive_mode(in_q_list=[], out_q_list=out_q_list)
             # stop with atexit
             atexit.register(mp_agent.stop_passive_mode)
@@ -13058,7 +13058,7 @@ def push_job_status_message(
         special_handling=None,
         extra_data=None,
     ):
-        if not (hasattr(panda_config, "mbproxy_configFile") and panda_config.mbproxy_configFile):
+        if not (hasattr(panda_config, "mq_configFile") and panda_config.mq_configFile):
             # skip if not configured
             return
         to_push = False

diff --git a/templates/panda_server.cfg.rpmnew.template b/templates/panda_server.cfg.rpmnew.template
@@ -289,11 +289,11 @@ auth_config = /opt/panda/etc/panda/auth/
 
 ##########################
 #
-# Message Broker Proxies
+# Message Queue parameters
 #
 
-# json config file of message broker proxies
-#mbproxy_configFile = /etc/panda/panda_mbproxy_config.json
+# json config file of message queues for PanDA functions to send to
+#mq_configFile = /etc/panda/panda_mq_config.json