Commit 767b991d authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Minor changes. 



Signed-off-by: default avatarCristiano Urban <cristiano.urban@inaf.it>
parent 83cca84f

transfer_service/mailer.py

+9 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ class Mailer(object): 
        self.smtpServer = params["smtp_server"]

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

        self.sender = params["no_reply_email"]

        self.logger = logging.getLogger("ImportExecutor.Mailer")

        self.logger = logging.getLogger("Mailer")

        self.recipients = []

        self.message = None
@@ -58,13 +58,17 @@ class Mailer(object): 
        try:

            smtpObj = smtplib.SMTP(self.smtpServer, self.smtpPort)

            smtpObj.send_message(self.message)

            self.logger.debug("E-mail message sent successfully!")

            logMsg = "E-mail message sent successfully!"

            self.logger.debug(logMsg)

        except SMTPConnectError:

            self.logger.exception("Cannot connect to SMTP server.")

            logMsg = "Cannot connect to SMTP server."

            self.logger.exception(logMsg)

        except TimeoutError:

            self.logger.exception("Connection timeout.")

            logMsg = "Connection timeout."

            self.logger.exception(logMsg)

        except SMTPException:

            self.logger.exception("Cannot send email message.")

            logMsg = "Cannot send email message."

            self.logger.exception(logMsg)





# Test 1

transfer_service/transfer_service.py

+9 −9
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class TransferService(object): 
        # Storage

        self.cliHandler.addRPCServer("storage", "storage_queue")



        #

        # Job scheduler task executors

        self.jobScheduler.addTaskExecutor("group_rw_executor")

        self.jobScheduler.addTaskExecutor("import_executor")

        self.jobScheduler.addTaskExecutor("retrieve_preprocessor")