Modified global configuration file path.

Signed-off-by: Cristiano Urban <cristiano.urban@inaf.it>

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"], 

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"]

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"],

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"], 

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"], 

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"], 

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"],

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"],

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"),

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"],

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"], 

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"],

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"),

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))

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")

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"))