Pass logger object to DbConnector class. (607baff6) · Commits · VOSpace INAF / vospace-transfer-service

transfer_service/abort_job_rpc_server.py

+9 −8

Original line number	Diff line number	Diff line
		@@ -18,14 +18,6 @@ class AbortJobRPCServer(RedisRPCServer):
		def __init__(self, host, port, db, rpcQueue):
		self.type = "abort"
		config = Config("/etc/vos_ts/vos_ts.conf")
		params = config.loadSection("file_catalog")
		self.dbConn = DbConnector(params["user"],
		params["password"],
		params["host"],
		params.getint("port"),
		params["db"],
		1,
		2)
		params = config.loadSection("transfer_node")
		self.storageStorePath = params["store_path"]
		params = config.loadSection("scheduling")
		@@ -39,6 +31,15 @@ class AbortJobRPCServer(RedisRPCServer):
		redisLogHandler = RedisLogHandler()
		redisLogHandler.setFormatter(logFormatter)
		self.logger.addHandler(redisLogHandler)
		params = config.loadSection("file_catalog")
		self.dbConn = DbConnector(params["user"],
		params["password"],
		params["host"],
		params.getint("port"),
		params["db"],
		1,
		2,
		self.logger)
		super(AbortJobRPCServer, self).__init__(host, port, db, rpcQueue)

		def callback(self, requestBody):

+9 −8

Original line number	Diff line number	Diff line
		@@ -30,14 +30,6 @@ class DataRPCServer(RedisRPCServer):
		def __init__(self, host, port, db, rpcQueue):
		self.type = "data"
		config = Config("/etc/vos_ts/vos_ts.conf")
		params = config.loadSection("file_catalog")
		self.dbConn = DbConnector(params["user"],
		params["password"],
		params["host"],
		params.getint("port"),
		params["db"],
		1,
		2)
		params = config.loadSection("transfer_node")
		self.storageStorePath = params["store_path"]
		params = config.loadSection("scheduling")
		@@ -51,6 +43,15 @@ class DataRPCServer(RedisRPCServer):
		redisLogHandler = RedisLogHandler()
		redisLogHandler.setFormatter(logFormatter)
		self.logger.addHandler(redisLogHandler)
		params = config.loadSection("file_catalog")
		self.dbConn = DbConnector(params["user"],
		params["password"],
		params["host"],
		params.getint("port"),
		params["db"],
		1,
		2,
		self.logger)
		self.pendingQueueWrite = JobQueue("write_pending")
		self.systemUtils = SystemUtils()
		super(DataRPCServer, self).__init__(host, port, db, rpcQueue)

+5 −4

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ from node import Node

		class DbConnector(object):

		def __init__(self, user, password, host, port, dbname, minConnNum, maxConnNum):
		def __init__(self, user, password, host, port, dbname, minConnNum, maxConnNum, logger):
		self.user = user
		self.password = password
		self.host = host
		@@ -28,6 +28,7 @@ class DbConnector(object):
		self.dbname = dbname
		self.minConnNum = minConnNum
		self.maxConnNum = maxConnNum
		self.logger = logger
		self.connPool = None
		self.createConnectionPool()

		@@ -51,11 +52,11 @@ class DbConnector(object):
		conn = None
		while retry > 0:
		try:
		logging.warning(f"Getting connection from pool: retry = {retry}")
		#self.logger.debug(f"DbConnector: getting connection from pool, retry = {retry}")
		conn = self.connPool.getconn()
		conn.reset()
		except Exception:
		logging.warning(f"Unable to get a connection from pool: retry = {retry}")
		self.logger.warning(f"DbConnector: unable to get a connection from pool, retry = {retry}")
		if conn is not None:
		self.connPool.putconn(conn, close = False)
		conn = None
		@@ -64,7 +65,7 @@ class DbConnector(object):
		if retry == 0:
		raise
		else:
		logging.warning(f"Connection established: retry = {retry}")
		#self.logger.debug(f"DbConnector: connection established, retry = {retry}")
		return conn

+9 −8

Original line number	Diff line number	Diff line
		@@ -25,14 +25,6 @@ class FileCleaner(object):

		def __init__(self):
		config = Config("/etc/vos_ts/vos_ts.conf")
		params = config.loadSection("file_catalog")
		self.dbConn = DbConnector(params["user"],
		params["password"],
		params["host"],
		params.getint("port"),
		params["db"],
		1,
		1)
		params = config.loadSection("cleanup")
		self.filesExpiration = json.loads(params["files_expiration"])
		self.days = self.filesExpiration["days"]
		@@ -46,6 +38,15 @@ class FileCleaner(object):
		redisLogHandler = RedisLogHandler()
		redisLogHandler.setFormatter(logFormatter)
		self.logger.addHandler(redisLogHandler)
		params = config.loadSection("file_catalog")
		self.dbConn = DbConnector(params["user"],
		params["password"],
		params["host"],
		params.getint("port"),
		params["db"],
		1,
		1,
		self.logger)

		def clean(self):
		try:

+9 −8

Original line number	Diff line number	Diff line
		@@ -25,14 +25,6 @@ class GroupRwExecutor(TaskExecutor):
		def __init__(self):
		self.type = "group_rw_executor"
		config = Config("/etc/vos_ts/vos_ts.conf")
		params = config.loadSection("file_catalog")
		self.dbConn = DbConnector(params["user"],
		params["password"],
		params["host"],
		params.getint("port"),
		params["db"],
		1,
		1)
		params = config.loadSection("mail")
		self.adminEmail = params["admin_email"]
		params = config.loadSection("logging")
		@@ -45,6 +37,15 @@ class GroupRwExecutor(TaskExecutor):
		redisLogHandler.setFormatter(logFormatter)
		self.logger.addHandler(redisLogHandler)
		self.resDir = params["res_dir"]
		params = config.loadSection("file_catalog")
		self.dbConn = DbConnector(params["user"],
		params["password"],
		params["host"],
		params.getint("port"),
		params["db"],
		1,
		1,
		self.logger)
		self.systemUtils = SystemUtils()
		self.jobObj = None
		self.jobId = None