Removed rabbitmq-name from AMSlib required fields (#99)

Signed-off-by: Loic Pottier <[email protected]>
LLNL · Feb 28, 2025 · 4d8e63b · 4d8e63b
1 parent 27db0eb
commit 4d8e63b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -466,7 +466,6 @@ jobs:
             \"db\": {
               \"dbType\": \"rmq\",
               \"rmq_config\": {
-                \"rabbitmq-name\": \"rabbit\",
                 \"rabbitmq-user\": \"${RABBITMQ_USER}\",
                 \"rabbitmq-password\": \"${RABBITMQ_PASS}\",
                 \"service-port\": ${RABBITMQ_PORT},

diff --git a/src/AMSlib/AMS.cpp b/src/AMSlib/AMS.cpp
@@ -373,7 +373,6 @@ class AMSWrap
     auto rmq_entry = entry["rmq_config"];
     int port = getEntry<int>(rmq_entry, "service-port");
     std::string host = getEntry<std::string>(rmq_entry, "service-host");
-    std::string rmq_name = getEntry<std::string>(rmq_entry, "rabbitmq-name");
     std::string rmq_pass =
         getEntry<std::string>(rmq_entry, "rabbitmq-password");
     std::string rmq_user = getEntry<std::string>(rmq_entry, "rabbitmq-user");
@@ -405,7 +404,6 @@ class AMSWrap
     auto &DB = ams::db::DBManager::getInstance();
     DB.instantiate_rmq_db(port,
                           host,
-                          rmq_name,
                           rmq_pass,
                           rmq_user,
                           rmq_vhost,

diff --git a/src/AMSlib/wf/basedb.hpp b/src/AMSlib/wf/basedb.hpp
@@ -1604,7 +1604,6 @@ class RMQInterface
   /**
    * @brief Connect to a RabbitMQ server
    * @param[in] rmq_name The name of the RabbitMQ server
-   * @param[in] rmq_name The name of the RabbitMQ server
    * @param[in] rmq_password The password
    * @param[in] rmq_user Username
    * @param[in] rmq_vhost Virtual host (by default RabbitMQ vhost = '/')
@@ -1616,8 +1615,7 @@ class RMQInterface
    * @param[in] routing_key Routing key for incoming messages (must match what the AMS Python side is using)
    * @return True, True if connection succeeded for both publisher/consumer
    */
-  std::pair<bool, bool> connect(std::string rmq_name,
-               std::string rmq_password,
+  std::pair<bool, bool> connect(std::string rmq_password,
                std::string rmq_user,
                std::string rmq_vhost,
                int service_port,
@@ -2076,7 +2074,6 @@ class DBManager
 
   void instantiate_rmq_db(int port,
                           std::string& host,
-                          std::string& rmq_name,
                           std::string& rmq_pass,
                           std::string& rmq_user,
                           std::string& rmq_vhost,
@@ -2096,8 +2093,7 @@ class DBManager
     dbType = AMSDBType::AMS_RMQ;
     updateSurrogate = update_surrogate;
 #ifdef __ENABLE_RMQ__
-    rmq_interface.connect(rmq_name,
-                          rmq_pass,
+    rmq_interface.connect(rmq_pass,
                           rmq_user,
                           rmq_vhost,
                           port,

diff --git a/src/AMSlib/wf/rmqdb.cpp b/src/AMSlib/wf/rmqdb.cpp
@@ -927,8 +927,7 @@ bool RMQPublisher::close(unsigned ms, int repeat)
  * RMQInterface
  */
 
- std::pair<bool, bool> RMQInterface::connect(std::string rmq_name,
-                           std::string rmq_password,
+ std::pair<bool, bool> RMQInterface::connect(std::string rmq_password,
                            std::string rmq_user,
                            std::string rmq_vhost,
                            int service_port,

diff --git a/tests/AMSlib/json_configs/rmq.json.in b/tests/AMSlib/json_configs/rmq.json.in
@@ -5,7 +5,6 @@
       "service-port": 0,
       "service-host": "",
       "rabbitmq-erlang-cookie": "",
-      "rabbitmq-name": "",
       "rabbitmq-password": "",
       "rabbitmq-user": "",
       "rabbitmq-vhost": "",