From 1f237b337d174754dec7d3151ac58be2c5b0eef7 Mon Sep 17 00:00:00 2001
From: Bo-Chun Louis Chen <louistw@uab.edu>
Date: Mon, 16 May 2022 14:05:47 -0500
Subject: [PATCH] Update add_account with updated_by field
---
create_account.py | 2 ++
prod_rmq_agents/task_manager.py | 2 +-
rc_util.py | 5 ++++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/create_account.py b/create_account.py
index d5ae3a2..9e834b6 100755
--- a/create_account.py
+++ b/create_account.py
@@ -25,6 +25,7 @@ args = parser.parse_args()
timeout = 60
queuename = rc_util.encode_name(args.username)
+updated_by = rc_util.get_caller_info()
if args.email == "":
args.email = args.username
@@ -58,6 +59,7 @@ rc_util.add_account(
email=args.email,
full=args.full_name,
reason=args.reason,
+ updated_by=updated_by,
)
print(f"Account for {args.username} requested.")
diff --git a/prod_rmq_agents/task_manager.py b/prod_rmq_agents/task_manager.py
index f843f0c..57d0305 100644
--- a/prod_rmq_agents/task_manager.py
+++ b/prod_rmq_agents/task_manager.py
@@ -277,7 +277,7 @@ def task_manager(ch, method, properties, body):
update_db(username, {"reported": True})
- rc_util.update_state(username, "ok")
+ rc_util.update_state(username, "ok", msg.get("updated_by"))
tracking.pop(username)
diff --git a/rc_util.py b/rc_util.py
index 271debb..d2bd46e 100644
--- a/rc_util.py
+++ b/rc_util.py
@@ -49,7 +49,9 @@ def timeout(seconds=30, error_message=os.strerror(errno.ETIME)):
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(
{
"routing_key": "request." + queuename,
@@ -59,6 +61,7 @@ def add_account(username, queuename, email, full="", reason=""):
"fullname": full,
"reason": reason,
"queuename": queuename,
+ "updated_by": updated_by,
},
}
)
--
GitLab