Skip to content
Snippets Groups Projects
Unverified Commit 05de62d5 authored by Ravi Tripathi's avatar Ravi Tripathi Committed by GitHub
Browse files

Merge pull request #71 from eesaanatluri/feat-add-uname-report-subject

Add uname to acct. creation report subject line.
parents 37134d98 9fb10be1
No related branches found
No related tags found
3 merge requests!147Merge previous default branch feat-cod-rmq into main,!85kill nginx process running under user from login node,!78Feat cod rmq
...@@ -31,6 +31,6 @@ Whole_mail = Head + Body ...@@ -31,6 +31,6 @@ Whole_mail = Head + Body
UserReportHead = f"""From: {Sender_alias} <{Sender}> UserReportHead = f"""From: {Sender_alias} <{Sender}>
To: <{Admin_email}> To: <{Admin_email}>
Subject: User Creation Report: Subject: RC Account Creation Report: {{{{ fullname }}}}, {{{{ username }}}}
""" """
...@@ -7,6 +7,7 @@ import dataset ...@@ -7,6 +7,7 @@ import dataset
import rc_util import rc_util
import smtplib import smtplib
from rc_rmq import RCRMQ from rc_rmq import RCRMQ
from jinja2 import Template
from datetime import datetime from datetime import datetime
import mail_config as mail_cfg import mail_config as mail_cfg
...@@ -49,16 +50,16 @@ rc_rmq = RCRMQ({'exchange': 'RegUsr', 'exchange_type': 'topic'}) ...@@ -49,16 +50,16 @@ rc_rmq = RCRMQ({'exchange': 'RegUsr', 'exchange_type': 'topic'})
def notify_admin(username, user_record): def notify_admin(username, user_record):
receivers = [user_record['email'], mail_cfg.Admin_email] receivers = [user_record['email'], mail_cfg.Admin_email]
message = mail_cfg.UserReportHead message = Template(mail_cfg.UserReportHead).render(username=username, fullname=user_record['fullname'])
message += f""" message += f""" \n
User Creation Report for user {username} User Creation Report for user {username}
uid: {user_record["uid"]}, gid: {user_record["gid"]} uid: {user_record["uid"]}, gid: {user_record["gid"]}
Tasks: Tasks:
'create_account': {user_record["request"]["create_account"]} 'create_account': {user_record["request"]["create_account"]}
'git_commit': {user_record["verify"]["git_commit"]} 'git_commit': {user_record["verify"]["git_commit"]}
'dir_verify': {user_record["verify"]["dir_verify"]} 'dir_verify': {user_record["verify"]["dir_verify"]}
'subscribe_mail_list': {user_record["verify"]["subscribe_mail_list"]} 'subscribe_mail_list': {user_record["verify"]["subscribe_mail_list"]}
'notify_user': {user_record["notify"]["notify_user"]} 'notify_user': {user_record["notify"]["notify_user"]}
""" """
if user_record['errmsg']: if user_record['errmsg']:
message += """ message += """
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment