commit e6e56e1bfb32fa0414fa12799aee6ebedc3e0612
author ricolin <rlin@vexxhost.com> Tue Jan 31 12:45:59 2023 +0800
committer ricolin <rlin@vexxhost.com> Tue Jan 31 12:45:59 2023 +0800
tree c61c4ffb283b5d32039a8a2a3a741d0496b8dbb7
parent cf26a5718ce91ff80cd7d0477eebfb10cd2d18cb

Add `notification.project_receiver_domain`

Add project_receiver_domain in notification config group to set project
receiver domain.
For example if project name is `admin` and project_receiver_domain is
`staffeln.com`, the project report will send to admin@staffeln.com email
address for admin project.

staffeln/conductor/result.py

diff --git a/staffeln/conductor/result.py b/staffeln/conductor/result.py
index 3b49a05..38e289d 100644
--- a/staffeln/conductor/result.py
+++ b/staffeln/conductor/result.py
@@ -22,7 +22,7 @@
     def add_project(self, project_id, project_name):

         self.project_list.add((project_id, project_name))

 

-    def send_result_email(self, subject=None, receiver=None):

+    def send_result_email(self, subject=None, project_name=None):

         if not CONF.notification.sender_email:

             LOG.info(

                 "Directly record report in log as sender email "

@@ -34,6 +34,16 @@
         if len(CONF.notification.receiver) != 0:

             # Found receiver in config, override report receiver.

             receiver = CONF.notification.receiver

+        elif not CONF.notification.project_receiver_domain:

+            LOG.info(

+                "Directly record report in log as no receiver email "

+                "or project receiver domain are not configed. "

+                f"Report: {self.content}"

+            )

+            return

+        else:

+            receiver_domain = CONF.notification.project_receiver_domain

+            receiver = f"{project_name}@{receiver_domain}"

         try:

             smtp_profile = {

                 "src_email": CONF.notification.sender_email,

@@ -135,5 +145,5 @@
         html = html.replace("${PROJECT_ID}", project_id)

         self.content += html

         subject = f"Staffeln Backup result: {project_id}"

-        self.send_result_email(subject=subject, receiver=f"{project_name}@cgm.com")

+        self.send_result_email(subject=subject, project_name=project_name)

         return True

staffeln/conf/notify.py

diff --git a/staffeln/conf/notify.py b/staffeln/conf/notify.py
index 890796a..b5a2246 100644
--- a/staffeln/conf/notify.py
+++ b/staffeln/conf/notify.py
@@ -18,6 +18,14 @@
         ),
     ),
     cfg.StrOpt(
+        "project_receiver_domain",
+        help=_(
+            "The project receiver domain that will be combine with project "
+            "name as project report receive target email address. "
+            "Format: $(project_name)@project_receiver_domain"
+        ),
+    ),
+    cfg.StrOpt(
         "sender_email",
         help=_(
             "Log in on an SMTP server that requires authentication."