From 93d8c446f2d4f34e1c09a90ced736d1dfcde2581 Mon Sep 17 00:00:00 2001
From: Cristiano Urban <cristiano.urban@inaf.it>
Date: Fri, 16 Jul 2021 15:27:43 +0200
Subject: [PATCH] Some code cleanup.

Signed-off-by: Cristiano Urban <cristiano.urban@inaf.it>
---
 transfer_service/mailer.py      | 12 -----------
 transfer_service/tape_client.py | 36 +--------------------------------
 2 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/transfer_service/mailer.py b/transfer_service/mailer.py
index 3c2da9f..fbf5eb9 100644
--- a/transfer_service/mailer.py
+++ b/transfer_service/mailer.py
@@ -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
 
diff --git a/transfer_service/tape_client.py b/transfer_service/tape_client.py
index 9298f07..86a54d3 100644
--- a/transfer_service/tape_client.py
+++ b/transfer_service/tape_client.py
@@ -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)
@@ -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): 
@@ -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):
@@ -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):
-- 
GitLab