Use config_get_list() where applicable rucio#7305

lib/rucio/core/nongrid_trace.py

@@ -20,7 +20,7 @@
 
 import stomp
 
-from rucio.common.config import config_get, config_get_int
+from rucio.common.config import config_get, config_get_int, config_get_list
 from rucio.common.logging import rucio_log_formatter
 from rucio.core.monitor import MetricManager
 
@@ -58,7 +58,7 @@
 
 BROKERS_ALIAS, BROKERS_RESOLVED = [], []
 try:
-    BROKERS_ALIAS = [b.strip() for b in config_get('nongrid-trace', 'brokers').split(',')]
+    BROKERS_ALIAS = config_get_list('nongrid-trace', 'brokers')
 except:
     raise Exception('Could not load brokers from configuration')
 

lib/rucio/core/trace.py

@@ -26,7 +26,7 @@
 import stomp
 from jsonschema import Draft7Validator, ValidationError, validate
 
-from rucio.common.config import config_get, config_get_int
+from rucio.common.config import config_get, config_get_int, config_get_list
 from rucio.common.exception import InvalidObject, TraceValidationSchemaNotFound
 from rucio.common.logging import rucio_log_formatter
 from rucio.common.schema.generic import TIME_ENTRY, UUID, IPv4orIPv6
@@ -70,7 +70,7 @@
 
 BROKERS_ALIAS, BROKERS_RESOLVED = [], []
 try:
-    BROKERS_ALIAS = [b.strip() for b in config_get('trace', 'brokers').split(',')]
+    BROKERS_ALIAS = config_get_list('trace', 'brokers')
 except:
     raise Exception('Could not load brokers from configuration')
 

lib/rucio/daemons/automatix/automatix.py

@@ -28,7 +28,7 @@
 from rucio.client import Client
 from rucio.client.uploadclient import UploadClient
 from rucio.common import exception
-from rucio.common.config import config_get, config_get_bool, config_get_int
+from rucio.common.config import config_get, config_get_bool, config_get_int, config_get_list
 from rucio.common.logging import setup_logging
 from rucio.common.stopwatch import Stopwatch
 from rucio.common.types import InternalScope, LoggerFunction
@@ -149,18 +149,14 @@ def run_once(heartbeat_handler: HeartbeatHandler, inputfile: str, **_kwargs) ->
 
     _, _, logger = heartbeat_handler.live()
     try:
-        rses = [
-            s.strip() for s in config_get("automatix", "rses").split(",")
-        ]  # TODO use config_get_list
+        rses = config_get_list("automatix", "rses")
     except (NoOptionError, NoSectionError, RuntimeError):
         logging.log(
             logging.ERROR,
             "Option rses not found in automatix section. Trying the legacy sites option",
         )
         try:
-            rses = [
-                s.strip() for s in config_get("automatix", "sites").split(",")
-            ]  # TODO use config_get_list
+            rses = config_get_list("automatix", "sites")
             logging.log(
                 logging.WARNING,
                 "Option sites found in automatix section. This option will be deprecated soon. Please update your config to use rses.",

lib/rucio/daemons/conveyor/receiver.py

@@ -28,7 +28,7 @@
 
 import rucio.db.sqla.util
 from rucio.common import exception
-from rucio.common.config import config_get, config_get_bool, config_get_int
+from rucio.common.config import config_get, config_get_bool, config_get_int, config_get_list
 from rucio.common.logging import setup_logging
 from rucio.common.policy import get_policy
 from rucio.core import request as request_core
@@ -134,7 +134,7 @@ def receiver(
     brokers_alias = []
     brokers_resolved = []
     try:
-        brokers_alias = [b.strip() for b in config_get('messaging-fts3', 'brokers').split(',')]
+        brokers_alias = config_get_list('messaging-fts3', 'brokers')
     except Exception:
         raise Exception('Could not load brokers from configuration')
 

lib/rucio/daemons/hermes/hermes.py

@@ -114,10 +114,7 @@ def setup_activemq(
     brokers_alias = []
     brokers_resolved = []
     try:
-        brokers_alias = [
-            broker.strip()
-            for broker in config_get("messaging-hermes", "brokers").split(",")
-        ]
+        brokers_alias = config_get_list("messaging-hermes", "brokers")
     except:
         raise Exception("Could not load brokers from configuration")
 

lib/rucio/daemons/tracer/kronos.py

@@ -364,7 +364,7 @@ def run_once_kronos_file(heartbeat_handler: HeartbeatHandler, stomp_conn_mngr: S
         username = config_get('tracer-kronos', 'username')
         password = config_get('tracer-kronos', 'password')
 
-    excluded_usrdns = set(config_get('tracer-kronos', 'excluded_usrdns').split(','))
+    excluded_usrdns = set(config_get_list('tracer-kronos', 'excluded_usrdns'))
     vhost = config_get('tracer-kronos', 'broker_virtual_host', raise_exception=False)
 
     brokers_alias = config_get_list('tracer-kronos', 'brokers')

tests/test_hermes.py

@@ -24,7 +24,7 @@
 import requests
 import stomp
 
-from rucio.common.config import config_get, config_get_int
+from rucio.common.config import config_get, config_get_int, config_get_list
 from rucio.core.message import add_message, retrieve_messages, truncate_messages
 from rucio.daemons.hermes import hermes
 from rucio.tests.common import rse_name_generator, skip_missing_elasticsearch_influxdb_in_env
@@ -140,7 +140,7 @@ def test_hermes(core_config_mock, caches_mock):
         add_message(
             "email",
             {
-                "to": config_get("messaging-hermes", "email_test").split(","),
+                "to": config_get_list("messaging-hermes", "email_test"),
                 "subject": "Half-Life %i" % i,
                 "body": """
                               Good morning, and welcome to the Black Mesa Transit System.