Commit a6be0ef7 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Pass logger object to 'Mailer' and 'TapeClient'. 



Signed-off-by: default avatarCristiano Urban <cristiano.urban.slack@gmail.com>
parent 82eb158d

transfer_service/group_rw_executor.py

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ class GroupRwExecutor(TaskExecutor): 
        self.dbConn.setEndTime(self.jobId)

        

        # Send e-mail notification

        m = Mailer()

        m = Mailer(self.logger)

        m.addRecipient(self.adminEmail)

        userEmail = self.dbConn.getUserEmail(self.userId)

        if userEmail != self.adminEmail:

transfer_service/import_executor.py

+8 −7
Original line number Diff line number Diff line
@@ -31,11 +31,6 @@ class ImportExecutor(TaskExecutor): 
                                  params["db"],

                                  1,

                                  1)        

        params = config.loadSection("spectrum_archive")

        self.tapeClient = TapeClient(params["host"],

                                     params.getint("port"),

                                     params["user"],

                                     params["pkey_file_path"])

        params = config.loadSection("mail")

        self.adminEmail = params["admin_email"]

        params = config.loadSection("logging")
@@ -51,6 +46,12 @@ class ImportExecutor(TaskExecutor): 
        self.logger.addHandler(redisLogHandler)

        self.logger.addHandler(logStreamHandler)

        self.resDir = params["res_dir"]

        params = config.loadSection("spectrum_archive")

        self.tapeClient = TapeClient(params["host"],

                                     params.getint("port"),

                                     params["user"],

                                     params["pkey_file_path"],

                                     self.logger)        

        self.systemUtils = SystemUtils()

        self.jobObj = None

        self.jobId = None
@@ -177,7 +178,7 @@ class ImportExecutor(TaskExecutor): 
        self.dbConn.setEndTime(self.jobId)



        # Send e-mail notification

        m = Mailer()

        m = Mailer(self.logger)

        m.addRecipient(self.adminEmail)

        msg = f"""

        [VOSpace import procedure summary]

transfer_service/mailer.py

+14 −13
Original line number Diff line number Diff line
@@ -15,25 +15,26 @@ from smtplib import SMTPException 


class Mailer(object):



    def __init__(self):

    def __init__(self, logger):

        config = Config("/etc/vos_ts/vos_ts.conf")

        params = config.loadSection("mail")

        self.smtpServer = params["smtp_server"]

        self.smtpPort = params.getint("smtp_port")

        self.sender = params["no_reply_email"]

        self.enabled = params.getboolean("enable_notifications")

        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

        #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

transfer_service/retrieve_cleaner.py

+0 −3
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ import shutil 


from config import Config

from db_connector import DbConnector

from mailer import Mailer

from redis_log_handler import RedisLogHandler

from task_executor import TaskExecutor
@@ -31,8 +30,6 @@ class RetrieveCleaner(TaskExecutor): 
        params = config.loadSection("async_recall")

        self.days = params.getint("days")

        self.seconds = params.getint("hours") * 3600 + params.getint("minutes") * 60 + params.getint("seconds")

        params = config.loadSection("mail")

        self.adminEmail = params["admin_email"]

        params = config.loadSection("logging")

        self.logger = logging.getLogger(__name__)

        logLevel = "logging." + params["log_level"]

transfer_service/retrieve_executor.py

+9 −8
Original line number Diff line number Diff line
@@ -41,12 +41,6 @@ class RetrieveExecutor(TaskExecutor): 
        self.type = "retrieve_executor"

        self.systemUtils = SystemUtils()

        config = Config("/etc/vos_ts/vos_ts.conf")                

        params = config.loadSection("spectrum_archive")

        self.tapeClient = TapeClient(params["host"],

                                     params.getint("port"),

                                     params["user"],

                                     params["pkey_file_path"])

        self.tapePool = params["tape_pool"]

        params = config.loadSection("transfer_node")

        self.storageRetrievePath = params["retrieve_path"]

        params = config.loadSection("file_catalog")
@@ -75,6 +69,13 @@ class RetrieveExecutor(TaskExecutor): 
        redisLogHandler.setFormatter(logFormatter)

        self.logger.addHandler(redisLogHandler)

        self.logger.addHandler(logStreamHandler)

        params = config.loadSection("spectrum_archive")

        self.tapePool = params["tape_pool"]

        self.tapeClient = TapeClient(params["host"],

                                     params.getint("port"),

                                     params["user"],

                                     params["pkey_file_path"],

                                     self.logger)

        self.storageType = None

        self.jobObj = None

        self.jobId = None
@@ -278,7 +279,7 @@ class RetrieveExecutor(TaskExecutor): 
        self.jobObj.jobInfo["destPathList"] = self.destPathList.copy()

        

        # Send e-mail notification

        m = Mailer()

        m = Mailer(self.logger)

                

        m.addRecipient(self.adminEmail)

        userEmail = self.dbConn.getUserEmail(self.jobObj.ownerId)