diff --git a/transfer_service/group_rw_executor.py b/transfer_service/group_rw_executor.py index b627c858fc752fd409c3eb786a1c3ec0abddb7ca..bd9403b57d24bcb74ef87b560fb2f43f1fa15e7b 100644 --- a/transfer_service/group_rw_executor.py +++ b/transfer_service/group_rw_executor.py @@ -26,6 +26,8 @@ class GroupRwExecutor(TaskExecutor): params["db"], 1, 1) + params = config.loadSection("mail") + self.adminEmail = params["admin_email"] params = config.loadSection("logging") self.logger = logging.getLogger("GroupRwExecutor") logLevel = "logging." + params["log_level"] @@ -50,7 +52,7 @@ class GroupRwExecutor(TaskExecutor): super(GroupRwExecutor, self).__init__() def updateGroupRw(self): - """This method adds/removes groups to group_read and group_write.""" + """This method adds/removes groups to/from 'group_read' and 'group_write'.""" self.dbConn.setPhase(self.jobId, "EXECUTING") self.dbConn.setStartTime(self.jobId) @@ -70,7 +72,7 @@ class GroupRwExecutor(TaskExecutor): # Send e-mail notification m = Mailer() - m.addRecipient("cristiano.urban@inaf.it") + m.addRecipient(self.adminEmail) if self.requestType == "GRPR_ADD": msg = f""" Added '{self.realGroupName}' to 'group_read' for {self.vospacePath} and any child nodes. diff --git a/transfer_service/import_executor.py b/transfer_service/import_executor.py index ee7ba676190e7cb0076f9b444175c0e98607d11a..e2ef62c6f8627c2d965ccfd684f3154a6d1ec26f 100644 --- a/transfer_service/import_executor.py +++ b/transfer_service/import_executor.py @@ -35,6 +35,8 @@ class ImportExecutor(TaskExecutor): params.getint("port"), params["user"], params["pkey_file_path"]) + params = config.loadSection("mail") + self.adminEmail = params["admin_email"] params = config.loadSection("logging") self.logger = logging.getLogger("ImportExecutor") logLevel = "logging." + params["log_level"] @@ -175,7 +177,7 @@ class ImportExecutor(TaskExecutor): # Send e-mail notification m = Mailer() - m.addRecipient("cristiano.urban@inaf.it") + m.addRecipient(self.adminEmail) msg = f""" [VOSpace import procedure summary]