Loading transfer_service/mailer.py +0 −12 Original line number Diff line number Diff line Loading @@ -23,18 +23,6 @@ class Mailer(object): self.sender = params["no_reply_email"] self.enabled = params.getboolean("enable_notifications") self.logger = logger #params = config.loadSection("logging") #self.logger = logging.getLogger(__name__) #logLevel = "logging." + params["log_level"] #logFormat = params["log_format"] #logFormatter = logging.Formatter(logFormat) #self.logger.setLevel(eval(logLevel)) #redisLogHandler = RedisLogHandler() #logStreamHandler = logging.StreamHandler() #logStreamHandler.setFormatter(logFormatter) #redisLogHandler.setFormatter(logFormatter) #self.logger.addHandler(redisLogHandler) #self.logger.addHandler(logStreamHandler) self.recipients = [] self.message = None Loading transfer_service/tape_client.py +1 −35 Original line number Diff line number Diff line Loading @@ -18,23 +18,10 @@ class TapeClient(object): # Constructor def __init__(self, host, port, user, keyFile, logger): #config = Config("/etc/vos_ts/vos_ts.conf") #params = config.loadSection("logging") #self.logger = logging.getLogger(__name__) #logLevel = "logging." + params["log_level"] #logFormat = params["log_format"] #logFormatter = logging.Formatter(logFormat) #self.logger.setLevel(eval(logLevel)) #redisLogHandler = RedisLogHandler() #logStreamHandler = logging.StreamHandler() #logStreamHandler.setFormatter(logFormatter) #redisLogHandler.setFormatter(logFormatter) #self.logger.addHandler(redisLogHandler) #self.logger.addHandler(logStreamHandler) self.logger = logger self.host = host self.port = port self.user = user self.logger = logger self.client = paramiko.SSHClient() self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) self.key = paramiko.RSAKey.from_private_key_file(keyFile) Loading Loading @@ -111,13 +98,6 @@ class TapeClient(object): self.logger.debug("MIGRATE operation COMPLETED.") else: self.logger.debug("MIGRATE operation FAILED.") # debug block... #out = open("tape_client_log.txt", "a") #out.write("MIGRATE\n") #out.write(f"exitCode: {exitCode}\n") #out.close() return exitCode def recall(self, fileList): Loading @@ -140,13 +120,6 @@ class TapeClient(object): self.logger.debug("RECALL operation COMPLETED.") else: self.logger.debug("RECALL operation FAILED.") # debug block... #out = open("tape_client_log.txt", "a") #out.write("RECALL\n") #out.write(f"exitCode: {exitCode}\n") #out.close() return exitCode def recallChecksumFiles(self, dirName): Loading @@ -162,13 +135,6 @@ class TapeClient(object): self.logger.debug("RECALL_CHECKSUM operation COMPLETED.") else: self.logger.debug("RECALL_CHECKSUM operation FAILED.") # debug block... #out = open("tape_client_log.txt", "a") #out.write("RECALL_CHECKSUM\n") #out.write(f"exitCode: {exitCode}\n") #out.close() return exitCode def disconnect(self): Loading Loading
transfer_service/mailer.py +0 −12 Original line number Diff line number Diff line Loading @@ -23,18 +23,6 @@ class Mailer(object): self.sender = params["no_reply_email"] self.enabled = params.getboolean("enable_notifications") self.logger = logger #params = config.loadSection("logging") #self.logger = logging.getLogger(__name__) #logLevel = "logging." + params["log_level"] #logFormat = params["log_format"] #logFormatter = logging.Formatter(logFormat) #self.logger.setLevel(eval(logLevel)) #redisLogHandler = RedisLogHandler() #logStreamHandler = logging.StreamHandler() #logStreamHandler.setFormatter(logFormatter) #redisLogHandler.setFormatter(logFormatter) #self.logger.addHandler(redisLogHandler) #self.logger.addHandler(logStreamHandler) self.recipients = [] self.message = None Loading
transfer_service/tape_client.py +1 −35 Original line number Diff line number Diff line Loading @@ -18,23 +18,10 @@ class TapeClient(object): # Constructor def __init__(self, host, port, user, keyFile, logger): #config = Config("/etc/vos_ts/vos_ts.conf") #params = config.loadSection("logging") #self.logger = logging.getLogger(__name__) #logLevel = "logging." + params["log_level"] #logFormat = params["log_format"] #logFormatter = logging.Formatter(logFormat) #self.logger.setLevel(eval(logLevel)) #redisLogHandler = RedisLogHandler() #logStreamHandler = logging.StreamHandler() #logStreamHandler.setFormatter(logFormatter) #redisLogHandler.setFormatter(logFormatter) #self.logger.addHandler(redisLogHandler) #self.logger.addHandler(logStreamHandler) self.logger = logger self.host = host self.port = port self.user = user self.logger = logger self.client = paramiko.SSHClient() self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) self.key = paramiko.RSAKey.from_private_key_file(keyFile) Loading Loading @@ -111,13 +98,6 @@ class TapeClient(object): self.logger.debug("MIGRATE operation COMPLETED.") else: self.logger.debug("MIGRATE operation FAILED.") # debug block... #out = open("tape_client_log.txt", "a") #out.write("MIGRATE\n") #out.write(f"exitCode: {exitCode}\n") #out.close() return exitCode def recall(self, fileList): Loading @@ -140,13 +120,6 @@ class TapeClient(object): self.logger.debug("RECALL operation COMPLETED.") else: self.logger.debug("RECALL operation FAILED.") # debug block... #out = open("tape_client_log.txt", "a") #out.write("RECALL\n") #out.write(f"exitCode: {exitCode}\n") #out.close() return exitCode def recallChecksumFiles(self, dirName): Loading @@ -162,13 +135,6 @@ class TapeClient(object): self.logger.debug("RECALL_CHECKSUM operation COMPLETED.") else: self.logger.debug("RECALL_CHECKSUM operation FAILED.") # debug block... #out = open("tape_client_log.txt", "a") #out.write("RECALL_CHECKSUM\n") #out.write(f"exitCode: {exitCode}\n") #out.close() return exitCode def disconnect(self): Loading