From c71db6cacebf38c5223614d1d22c994f80310e86 Mon Sep 17 00:00:00 2001 From: Cristiano Urban Date: Fri, 2 Apr 2021 15:14:06 +0200 Subject: [PATCH] Modified global configuration file path. Signed-off-by: Cristiano Urban --- transfer_service/abort_job_amqp_server.py | 2 +- transfer_service/checksum.py | 2 +- transfer_service/cleaner.py | 2 +- transfer_service/data_amqp_server.py | 2 +- transfer_service/get_job_amqp_server.py | 2 +- transfer_service/import_amqp_server.py | 2 +- transfer_service/job_amqp_server.py | 2 +- transfer_service/job_queue.py | 2 +- transfer_service/retrieve_executor.py | 2 +- transfer_service/retrieve_preprocessor.py | 2 +- transfer_service/start_job_amqp_server.py | 2 +- transfer_service/storage_amqp_server.py | 2 +- transfer_service/store_executor.py | 2 +- transfer_service/store_preprocessor.py | 2 +- transfer_service/task_executor.py | 2 +- transfer_service/transfer_service.py | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/transfer_service/abort_job_amqp_server.py b/transfer_service/abort_job_amqp_server.py index f1835b0..641b539 100644 --- a/transfer_service/abort_job_amqp_server.py +++ b/transfer_service/abort_job_amqp_server.py @@ -9,7 +9,7 @@ class AbortJobAMQPServer(AMQPServer): def __init__(self, host, port, queue): self.type = "abort" - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("file_catalog") self.dbConn = DbConnector(self.params["user"], self.params["password"], diff --git a/transfer_service/checksum.py b/transfer_service/checksum.py index 9400e51..75b6fbd 100644 --- a/transfer_service/checksum.py +++ b/transfer_service/checksum.py @@ -10,7 +10,7 @@ from config import Config class Checksum(object): def __init__(self): - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("checksum") self.fileBufferSize = self.params.getint("file_buffer_size") self.md5FileSuffix = self.params["md5_file_suffix"] diff --git a/transfer_service/cleaner.py b/transfer_service/cleaner.py index 9b28c7a..8d3830d 100644 --- a/transfer_service/cleaner.py +++ b/transfer_service/cleaner.py @@ -7,7 +7,7 @@ from config import Config from db_connector import DbConnector -config = Config("vos_ts.conf") +config = Config("/etc/vos_ts/vos_ts.conf") params = config.loadSection("file_catalog") dbConn = DbConnector(params["user"], params["password"], diff --git a/transfer_service/data_amqp_server.py b/transfer_service/data_amqp_server.py index 2d6e58a..8b21c81 100644 --- a/transfer_service/data_amqp_server.py +++ b/transfer_service/data_amqp_server.py @@ -23,7 +23,7 @@ class DataAMQPServer(AMQPServer): def __init__(self, host, port, queue): self.type = "data" self.storeAck = False - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("file_catalog") self.dbConn = DbConnector(self.params["user"], self.params["password"], diff --git a/transfer_service/get_job_amqp_server.py b/transfer_service/get_job_amqp_server.py index 75370ff..a8a8eff 100644 --- a/transfer_service/get_job_amqp_server.py +++ b/transfer_service/get_job_amqp_server.py @@ -11,7 +11,7 @@ class GetJobAMQPServer(AMQPServer): def __init__(self, host, port, queue): self.type = "poll" - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("file_catalog") self.dbConn = DbConnector(self.params["user"], self.params["password"], diff --git a/transfer_service/import_amqp_server.py b/transfer_service/import_amqp_server.py index 03079be..0b49533 100644 --- a/transfer_service/import_amqp_server.py +++ b/transfer_service/import_amqp_server.py @@ -17,7 +17,7 @@ class ImportAMQPServer(AMQPServer): def __init__(self, host, port, queue): self.type = "import" self.md5calc = Checksum() - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("file_catalog") self.dbConn = DbConnector(self.params["user"], self.params["password"], diff --git a/transfer_service/job_amqp_server.py b/transfer_service/job_amqp_server.py index 4e59ad4..257e727 100644 --- a/transfer_service/job_amqp_server.py +++ b/transfer_service/job_amqp_server.py @@ -11,7 +11,7 @@ class JobAMQPServer(AMQPServer): def __init__(self, host, port, queue): self.type = "job" - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("file_catalog") self.dbConn = DbConnector(self.params["user"], self.params["password"], diff --git a/transfer_service/job_queue.py b/transfer_service/job_queue.py index 9b319fd..137d996 100644 --- a/transfer_service/job_queue.py +++ b/transfer_service/job_queue.py @@ -13,7 +13,7 @@ from job import Job class JobQueue(object): def __init__(self, queueName): - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("job_cache") self.redisCli = redis.Redis(host = self.params["host"], port = self.params["port"], diff --git a/transfer_service/retrieve_executor.py b/transfer_service/retrieve_executor.py index bd3a08c..795492a 100644 --- a/transfer_service/retrieve_executor.py +++ b/transfer_service/retrieve_executor.py @@ -13,7 +13,7 @@ from task_executor import TaskExecutor class RetrieveExecutor(TaskExecutor): def __init__(self): - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("spectrum_archive") self.tapeClient = TapeClient(self.params["host"], self.params.getint("port"), diff --git a/transfer_service/retrieve_preprocessor.py b/transfer_service/retrieve_preprocessor.py index 6ac9e2d..9c33732 100644 --- a/transfer_service/retrieve_preprocessor.py +++ b/transfer_service/retrieve_preprocessor.py @@ -8,7 +8,7 @@ from task_executor import TaskExecutor class RetrievePreprocessor(TaskExecutor): def __init__(self): - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("file_catalog") self.dbConn = DbConnector(self.params["user"], self.params["password"], diff --git a/transfer_service/start_job_amqp_server.py b/transfer_service/start_job_amqp_server.py index 3a33e55..e15207c 100644 --- a/transfer_service/start_job_amqp_server.py +++ b/transfer_service/start_job_amqp_server.py @@ -13,7 +13,7 @@ class StartJobAMQPServer(AMQPServer): def __init__(self, host, port, queue): self.type = "start" - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("file_catalog") self.dbConn = DbConnector(self.params["user"], self.params["password"], diff --git a/transfer_service/storage_amqp_server.py b/transfer_service/storage_amqp_server.py index 2a114f6..6f2df44 100644 --- a/transfer_service/storage_amqp_server.py +++ b/transfer_service/storage_amqp_server.py @@ -11,7 +11,7 @@ class StorageAMQPServer(AMQPServer): def __init__(self, host, port, queue): self.type = "storage" - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("file_catalog") self.dbConn = DbConnector(self.params["user"], self.params["password"], diff --git a/transfer_service/store_executor.py b/transfer_service/store_executor.py index 085202b..3323290 100644 --- a/transfer_service/store_executor.py +++ b/transfer_service/store_executor.py @@ -15,7 +15,7 @@ from task_executor import TaskExecutor class StoreExecutor(TaskExecutor): def __init__(self): - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("spectrum_archive") self.tapeClient = TapeClient(self.params["host"], self.params.getint("port"), diff --git a/transfer_service/store_preprocessor.py b/transfer_service/store_preprocessor.py index 30d40ad..f315827 100644 --- a/transfer_service/store_preprocessor.py +++ b/transfer_service/store_preprocessor.py @@ -27,7 +27,7 @@ class StorePreprocessor(TaskExecutor): def __init__(self): self.systemUtils = SystemUtils() self.md5calc = Checksum() - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("file_grouper") self.fileGrouper = FileGrouper(self.params.getint("min_num_files"), self.params.getint("max_dir_size") * (2 ** 30)) diff --git a/transfer_service/task_executor.py b/transfer_service/task_executor.py index aa1b9a7..ced7a7d 100644 --- a/transfer_service/task_executor.py +++ b/transfer_service/task_executor.py @@ -11,7 +11,7 @@ from job_queue import JobQueue class TaskExecutor(Process): def __init__(self): - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("scheduling") self.maxPendingJobs = self.params.getint("max_pending_jobs") self.maxReadyJobs = self.params.getint("max_ready_jobs") diff --git a/transfer_service/transfer_service.py b/transfer_service/transfer_service.py index 2bd6395..a9ec0f9 100644 --- a/transfer_service/transfer_service.py +++ b/transfer_service/transfer_service.py @@ -9,7 +9,7 @@ from vospace_rest_handler import VOSpaceRestHandler class TransferService(object): def __init__(self): - config = Config("vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("amqp") self.cliHandler = CliHandler(self.params["host"], self.params.getint("port")) self.vosRestHandler = VOSpaceRestHandler(self.params["host"], self.params.getint("port")) -- GitLab