Skip to content
Snippets Groups Projects
Commit d5fda706 authored by Eesaan Atluri's avatar Eesaan Atluri
Browse files

Add fullname and blazerID to the subj line of admin report email.

parent 3634447a
No related branches found
No related tags found
No related merge requests found
......@@ -31,6 +31,6 @@ Whole_mail = Head + Body
UserReportHead = f"""From: {Sender_alias} <{Sender}>
To: <{Admin_email}>
Subject: User Creation Report:
Subject: RC Account Creation Report: {{{{ fullname }}}}, {{{{ username }}}}
"""
......@@ -7,6 +7,7 @@ import dataset
import rc_util
import smtplib
from rc_rmq import RCRMQ
from jinja2 import Template
from datetime import datetime
import mail_config as mail_cfg
......@@ -47,18 +48,18 @@ tracking = {}
# Instantiate rabbitmq object
rc_rmq = RCRMQ({'exchange': 'RegUsr', 'exchange_type': 'topic'})
def notify_admin(username, user_record):
def notify_admin(username, fullname, user_record):
receivers = [user_record['email'], mail_cfg.Admin_email]
message = mail_cfg.UserReportHead
message += f"""
User Creation Report for user {username}
uid: {user_record["uid"]}, gid: {user_record["gid"]}
Tasks:
'create_account': {user_record["request"]["create_account"]}
'git_commit': {user_record["verify"]["git_commit"]}
'dir_verify': {user_record["verify"]["dir_verify"]}
'subscribe_mail_list': {user_record["verify"]["subscribe_mail_list"]}
'notify_user': {user_record["notify"]["notify_user"]}
message = Template(mail_cfg.UserReportHead).render(username=username, fullname=fullname)
message += f""" \n
User Creation Report for user {username}
uid: {user_record["uid"]}, gid: {user_record["gid"]}
Tasks:
'create_account': {user_record["request"]["create_account"]}
'git_commit': {user_record["verify"]["git_commit"]}
'dir_verify': {user_record["verify"]["dir_verify"]}
'subscribe_mail_list': {user_record["verify"]["subscribe_mail_list"]}
'notify_user': {user_record["notify"]["notify_user"]}
"""
if user_record['errmsg']:
message += """
......@@ -112,6 +113,7 @@ def update_db(username, data):
def task_manager(ch, method, properties, body):
msg = json.loads(body)
username = method.routing_key.split('.')[1]
fullname = msg['fullname']
task_name = msg['task']
success = msg['success']
send = completed = terminated = False
......@@ -242,7 +244,7 @@ def task_manager(ch, method, properties, body):
# Send report to admin
if completed or terminated:
notify_admin(username, current)
notify_admin(username, fullname, current)
update_db(username, {'reported': True})
......
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