diff --git a/transfer_service/abort_job_amqp_server.py b/transfer_service/abort_job_amqp_server.py index f1835b00a2b580fe2763605a5122a5cf4463e6e8..641b539b8b5aac573233be7d8c7bfb6bc21b6d46 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 9400e51c93afe439784e280e1463d75ef7f40da3..75b6fbd91d936f06cb93ec84f69cc8148cdffb4d 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 9b28c7a9c78925d17f83ac0166792a1de358502c..8d3830d7b9dd3a7cc898c3d9bf312649fe1d22db 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 2d6e58afd48961f8386cad117a6b5b5eeec3b846..8b21c8159f8fee5bcb7e72e4ee15546212e1b7bb 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 75370ffcf155d77fe73b130324fedd4d3c13a1b6..a8a8eff256eccc44cf78cbde5f321e0d3f4eb72f 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 03079be675c57de23b919ee25876cc654e8abda3..0b49533e95f24d10ed93f9720127e3169a47d60e 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 4e59ad4323ec6a85397c86c4206954680b8eaa5e..257e727c652884ee890179e997e264bff96f59f5 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 9b319fda36602e89df81450ae7cd3b32a5dd2560..137d99679756ae3f38dc918a9b710248aab3f919 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 bd3a08c1e69af663c0fa14f0924ed91cbe073ee8..795492a8bcb6012dd94b282116a95b435a464ec8 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 6ac9e2d01278f74ada3f8d07ee492fcb2eaa6651..9c3373279069eea58d47781586429c326dedf2cb 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 3a33e557eb97537b7b68c5322b1a017a5cfb2f2f..e15207cb17e56aed6c3499a9ace9d7723c91a9fc 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 2a114f68dc5d464b86cde7e3c6b5371084e55986..6f2df446f01d7b2cf748b0a6a981f941696191b9 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 085202b7d6999f22292eec7678f2d272cadba1db..33232909006e6e08fa822e27af51a437eda99424 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 30d40adc2661a9e5044d5a64136a2586d3fdf26e..f31582773a95814af50529ae592f95b478fef681 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 aa1b9a7a0fff47d71f581c49b2bff568471a79a8..ced7a7d3d6292b5455b3e4372bea847f688d8ea1 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 2bd63954187b2c4c35af546f93b761a9ebcf3af8..a9ec0f9f468e01ce0b581cad07e0dee24b40fab8 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"))