diff --git a/mail_config.py.example b/mail_config.py.example index 434cb44e7928dacc9143afd00ad0cdf3f8b87679..e699d8b2733deda1c1510d11c4bc8503a1289a4a 100644 --- a/mail_config.py.example +++ b/mail_config.py.example @@ -25,5 +25,5 @@ Whole_mail = Head + Body UserReportHead = f"""From: {rcfg.Sender_alias} <{rcfg.Sender}> To: <{rcfg.Admin_email}> -Subject: RC Account Creation Report: {{{{ fullname }}}}, {{{{ username }}}} """ +Subject: [{{{{ result }}}}]RC Account Creation Report: {{{{ fullname }}}}, {{{{ username }}}} """ diff --git a/prod_rmq_agents/task_manager.py b/prod_rmq_agents/task_manager.py index 795f7c322dce8ba1c5b2e40a583e685f86884c03..c48a40ac6a250e4202bc231804aa06ac289d83ae 100644 --- a/prod_rmq_agents/task_manager.py +++ b/prod_rmq_agents/task_manager.py @@ -52,7 +52,15 @@ rc_rmq = RCRMQ({'exchange': 'RegUsr', 'exchange_type': 'topic'}) def notify_admin(username, user_record): receivers = [rcfg.Admin_email] - message = Template(mail_cfg.UserReportHead).render(username=username, fullname=user_record['fullname']) + + result = "SUCCESS" if user_record["request"]["create_account"] and\ + user_record["verify"]["git_commit"] and\ + user_record["verify"]["dir_verify"] and\ + user_record["verify"]["subscribe_mail_list"] and\ + user_record["notify"]["notify_user"]\ + else "FAILED" + + message = Template(mail_cfg.UserReportHead).render(username=username, fullname=user_record['fullname'], result=result) if user_record['reported']: message += ' (Duplicate)' message += f""" \n