Skip to content
Snippets Groups Projects
Commit 1f237b33 authored by Bo-Chun Chen's avatar Bo-Chun Chen
Browse files

Update add_account with updated_by field

parent ec139aa2
No related branches found
No related tags found
2 merge requests!147Merge previous default branch feat-cod-rmq into main,!127Add updated_by field to user_state table
...@@ -25,6 +25,7 @@ args = parser.parse_args() ...@@ -25,6 +25,7 @@ args = parser.parse_args()
timeout = 60 timeout = 60
queuename = rc_util.encode_name(args.username) queuename = rc_util.encode_name(args.username)
updated_by = rc_util.get_caller_info()
if args.email == "": if args.email == "":
args.email = args.username args.email = args.username
...@@ -58,6 +59,7 @@ rc_util.add_account( ...@@ -58,6 +59,7 @@ rc_util.add_account(
email=args.email, email=args.email,
full=args.full_name, full=args.full_name,
reason=args.reason, reason=args.reason,
updated_by=updated_by,
) )
print(f"Account for {args.username} requested.") print(f"Account for {args.username} requested.")
......
...@@ -277,7 +277,7 @@ def task_manager(ch, method, properties, body): ...@@ -277,7 +277,7 @@ def task_manager(ch, method, properties, body):
update_db(username, {"reported": True}) update_db(username, {"reported": True})
rc_util.update_state(username, "ok") rc_util.update_state(username, "ok", msg.get("updated_by"))
tracking.pop(username) tracking.pop(username)
......
...@@ -49,7 +49,9 @@ def timeout(seconds=30, error_message=os.strerror(errno.ETIME)): ...@@ -49,7 +49,9 @@ def timeout(seconds=30, error_message=os.strerror(errno.ETIME)):
return decorator return decorator
def add_account(username, queuename, email, full="", reason=""): def add_account(
username, queuename, email, full="", reason="", updated_by=None
):
rc_rmq.publish_msg( rc_rmq.publish_msg(
{ {
"routing_key": "request." + queuename, "routing_key": "request." + queuename,
...@@ -59,6 +61,7 @@ def add_account(username, queuename, email, full="", reason=""): ...@@ -59,6 +61,7 @@ def add_account(username, queuename, email, full="", reason=""):
"fullname": full, "fullname": full,
"reason": reason, "reason": reason,
"queuename": queuename, "queuename": queuename,
"updated_by": updated_by,
}, },
} }
) )
......
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